...
|
...
|
@@ -541,58 +541,44 @@ Tor?</a></h3>
|
541
|
541
|
</p>
|
542
|
542
|
|
543
|
543
|
<p>
|
544
|
|
- The Tor software is <a href="https://www.fsf.org/">free
|
545
|
|
-software</a>. This
|
546
|
|
- means we give you the rights to redistribute the Tor software,
|
547
|
|
-either
|
548
|
|
- modified or unmodified, either for a fee or gratis. You don't have
|
549
|
|
-to
|
|
544
|
+ The Tor software is <a href="https://www.fsf.org/">free software</a>. This
|
|
545
|
+ means we give you the rights to redistribute the Tor software, either
|
|
546
|
+ modified or unmodified, either for a fee or gratis. You don't have to
|
550
|
547
|
ask us for specific permission.
|
551
|
548
|
</p>
|
552
|
549
|
|
553
|
550
|
<p>
|
554
|
|
- However, if you want to redistribute the Tor software you must
|
555
|
|
-follow our
|
|
551
|
+ However, if you want to redistribute the Tor software you must follow our
|
556
|
552
|
<a href="<gitblob>LICENSE">LICENSE</a>.
|
557
|
|
- Essentially this means that you need to include our LICENSE file
|
558
|
|
-along
|
|
553
|
+ Essentially this means that you need to include our LICENSE file along
|
559
|
554
|
with whatever part of the Tor software you're distributing.
|
560
|
555
|
</p>
|
561
|
556
|
|
562
|
557
|
<p>
|
563
|
|
- Most people who ask us this question don't want to distribute just
|
564
|
|
-the
|
|
558
|
+ Most people who ask us this question don't want to distribute just the
|
565
|
559
|
Tor software, though. They want to distribute the <a
|
566
|
560
|
href="<page projects/torbrowser>">Tor Browser</a>. This includes <a
|
567
|
|
- href="https://www.mozilla.org/en-US/firefox/all-aurora.html">Mozilla
|
568
|
|
- Aurora</a> and <a href="<page projects/vidalia>">Vidalia</a>.
|
569
|
|
- You will need to follow the licenses for those programs
|
570
|
|
- as well. Both of them are distributed under the <a
|
571
|
|
- href="https://www.fsf.org/licensing/licenses/gpl.html">GNU General
|
572
|
|
- Public License</a>. The simplest way to obey their licenses is
|
573
|
|
- to include the source code for these programs everywhere you
|
574
|
|
- include the bundles themselves. Look for "source" packages on
|
575
|
|
- the <a href="<page projects/vidalia>">Vidalia page</a> and <a
|
576
|
|
- href="https://www.mozilla.org/en-US/firefox/all-aurora.html">Mozilla
|
577
|
|
- Aurora</a> pages.
|
|
561
|
+ href="https://www.mozilla.org/en-US/firefox/organizations/">Firefox
|
|
562
|
+ Extended Support Release</a>, and the NoScript and HTTPS-Everywhere
|
|
563
|
+ extensions. You will need to follow the licensefor those programs as
|
|
564
|
+ well. Both of those Firefox extensions are distributed under
|
|
565
|
+ the <a href="https://www.fsf.org/licensing/licenses/gpl.html">GNU General
|
|
566
|
+ Public License</a>, while Firefox ESR is released under the Mozilla Public
|
|
567
|
+ License. The simplest way to obey their licenses is to include the source
|
|
568
|
+ code for these programs everywhere you include the bundles themselves.
|
578
|
569
|
</p>
|
579
|
570
|
|
580
|
571
|
<p>
|
581
|
|
- Also, you should make sure not to confuse your readers about what
|
582
|
|
-Tor is,
|
583
|
|
- who makes it, and what properties it provides (and doesn't provide).
|
584
|
|
-See
|
585
|
|
- our <a href="<page docs/trademark-faq>">trademark FAQ</a> for
|
586
|
|
-details.
|
|
572
|
+ Also, you should make sure not to confuse your readers about what Tor is,
|
|
573
|
+ who makes it, and what properties it provides (and doesn't provide). See
|
|
574
|
+ our <a href="<page docs/trademark-faq>">trademark FAQ</a> for details.
|
587
|
575
|
</p>
|
588
|
576
|
|
589
|
577
|
<p>
|
590
|
578
|
Lastly, you should realize that we release new versions of the
|
591
|
579
|
Tor software frequently, and sometimes we make backward incompatible
|
592
|
|
- changes. So if you distribute a particular version of the Tor
|
593
|
|
-software, it
|
594
|
|
- may not be supported — or even work — six months later.
|
595
|
|
-This
|
|
580
|
+ changes. So if you distribute a particular version of the Tor software, it
|
|
581
|
+ may not be supported — or even work — six months later. This
|
596
|
582
|
is a fact of life for all security software under heavy development.
|
597
|
583
|
</p>
|
598
|
584
|
|