Browse code

attempt to clarify the distributing tor faq, now that someone called and was very confused.

Andrew Lewman authored on 14/11/2011 22:09:18
Showing 1 changed files
... ...
@@ -318,7 +318,7 @@ encryption, what data you're sending to the destination.</dd>
318 318
     <hr>
319 319
 
320 320
     <a id="DistributingTor"></a>
321
-    <h3><a class="anchor" href="#DistributingTor">Can I distribute Tor on my magazine's CD?</a></h3>
321
+    <h3><a class="anchor" href="#DistributingTor">Can I distribute Tor?</a></h3>
322 322
 
323 323
     <p>
324 324
     Yes.
... ...
@@ -340,18 +340,20 @@ encryption, what data you're sending to the destination.</dd>
340 340
 
341 341
     <p>
342 342
     Most people who ask us this question don't want to distribute just the
343
-    Tor software, though. They want to distribute the Tor bundles, which
344
-    typically include <a href="http://www.pps.jussieu.fr/~jch/software/polipo/">Polipo</a>
345
-    and <a href="<page projects/vidalia>">Vidalia</a>.
343
+    Tor software, though. They want to distribute the <a
344
+    href="https://www.torproject.org/projects/torbrowser.html.en">Tor
345
+    Browser</a>. This includes <a
346
+    href="https://www.mozilla.org/en-US/firefox/all-aurora.html">Mozilla
347
+    Aurora</a> and <a href="<page projects/vidalia>">Vidalia</a>.
346 348
     You will need to follow the licenses for those programs
347 349
     as well. Both of them are distributed under the <a
348 350
     href="https://www.fsf.org/licensing/licenses/gpl.html">GNU General
349
-    Public License</a>. The simplest way to obey their licenses is to
350
-    include the source code for these programs everywhere you include
351
-    the bundles themselves. Look for "source" packages on the <a
352
-    href="<page projects/vidalia>">Vidalia page</a> and the <a
353
-    href="http://www.pps.jussieu.fr/~jch/software/polipo/">Polipo
354
-    download page</a>.
351
+    Public License</a>. The simplest way to obey their licenses is
352
+    to include the source code for these programs everywhere you
353
+    include the bundles themselves. Look for "source" packages on
354
+    the <a href="<page projects/vidalia>">Vidalia page</a> and <a
355
+    href="https://www.mozilla.org/en-US/firefox/all-aurora.html">Mozilla
356
+    Aurora</a> pages.
355 357
     </p>
356 358
 
357 359
     <p>