torproject/webwml
1
0
Fork 0
mirror of https://github.com/torproject/webwml.git synced 2025-03-04 16:28:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andrew Lewman 2011-11-14 21:09:18 +00:00
parent 4c340d9ad0
commit db1b880969
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
docs/en/faq.wml
View File

@ -318,7 +318,7 @@ encryption, what data you're sending to the destination.</dd>
<hr>
<a id="DistributingTor"></a>
<h3><a class="anchor" href="#DistributingTor">Can I distribute Tor on my magazine's CD?</a></h3>
<h3><a class="anchor" href="#DistributingTor">Can I distribute Tor?</a></h3>
<p>
Yes.
@ -340,18 +340,20 @@ encryption, what data you're sending to the destination.</dd>
<p>
Most people who ask us this question don't want to distribute just the
Tor software, though. They want to distribute the Tor bundles, which
typically include <a href="http://www.pps.jussieu.fr/~jch/software/polipo/">Polipo</a>
and <a href="<page projects/vidalia>">Vidalia</a>.
Tor software, though. They want to distribute the <a
href="https://www.torproject.org/projects/torbrowser.html.en">Tor
Browser</a>. This includes <a
href="https://www.mozilla.org/en-US/firefox/all-aurora.html">Mozilla
Aurora</a> and <a href="<page projects/vidalia>">Vidalia</a>.
You will need to follow the licenses for those programs
as well. Both of them are distributed under the <a
href="https://www.fsf.org/licensing/licenses/gpl.html">GNU General
Public License</a>. The simplest way to obey their licenses is to
include the source code for these programs everywhere you include
the bundles themselves. Look for "source" packages on the <a
href="<page projects/vidalia>">Vidalia page</a> and the <a
href="http://www.pps.jussieu.fr/~jch/software/polipo/">Polipo
download page</a>.
Public License</a>. The simplest way to obey their licenses is
to include the source code for these programs everywhere you
include the bundles themselves. Look for "source" packages on
the <a href="<page projects/vidalia>">Vidalia page</a> and <a
href="https://www.mozilla.org/en-US/firefox/all-aurora.html">Mozilla
Aurora</a> pages.
</p>
<p>