Andrew Lewman commited on 2008-01-01 03:35:02
Zeige 1 geänderte Dateien mit 14 Einfügungen und 8 Löschungen.
... | ... |
@@ -181,14 +181,20 @@ reason.</p> |
181 | 181 |
<h3><a class="anchor" href="#License">Is the Tor software subject to |
182 | 182 |
any license terms?</a></h3> |
183 | 183 |
|
184 |
-<p><strong>Yes.</strong> The Tor license is included in the software |
|
185 |
-download and reproduced below. (However, note that the Tor download |
|
186 |
-bundles include other software too, such as Vidalia and Privoxy, and if |
|
187 |
-you use the bundles you will need to follow the licenses for all the |
|
188 |
-programs they include as well.)</p> |
|
189 |
- |
|
190 |
-<p>Copyright (c) 2001-2004, Roger Dingledine<br /> |
|
191 |
-Copyright (c) 2004-2007, Roger Dingledine, Nick Mathewson</p> |
|
184 |
+<p><strong>Yes.</strong> The Tor software is distributed under the |
|
185 |
+Modified BSD license, and is reproduced below. The Vidalia software is distributed under |
|
186 |
+the GPL v2. Privoxy is distributed under the GPL v2. |
|
187 |
+"src/common/strlcat.c and src/common/strlcpy.c" by Todd C. Miller are |
|
188 |
+licensed under the Modified BSD license. </p> |
|
189 |
+ |
|
190 |
+<p>If you have Tor as a static binary with OpenSSL included, then you |
|
191 |
+should know: "This product includes software developed by the OpenSSL Project |
|
192 |
+ for use in the OpenSSL Toolkit (http://www.openssl.org/)"</p> |
|
193 |
+ |
|
194 |
+<p>The Tor software license is the Modified BSD, which is as follows:</p> |
|
195 |
+<p>Copyright © 2001-2004, Roger Dingledine<br /> |
|
196 |
+Copyright © 2004-2007, Roger Dingledine, Nick Mathewson<br /> |
|
197 |
+Copyright © 2007 The Tor Project, Inc.</p> |
|
192 | 198 |
|
193 | 199 |
<p>Redistribution and use in source and binary forms, with or without |
194 | 200 |
modification, are permitted provided that the following conditions are |
195 | 201 |