[tor-commits] [webwml/master] Merge branch 'master' into faq-ipv6

[hiro at torproject.org]

commit c758bae9a532c5d26ab473257fa4d7e0bc6cb6ec
Merge: 1fee6ee4 efffbdc9
Author: traumschule <traumschuleriebau at riseup.net>
Date:   Wed Aug 22 21:40:50 2018 +0200

    Merge branch 'master' into faq-ipv6

 .well-known/security.txt                   |   12 +
 about/en/contact.wml                       |   17 +-
 about/en/corepeople.wml                    |  145 +-
 about/en/jobs.wml                          |    4 +-
 about/en/overview.wml                      |   16 +-
 docs/debian-selector.js                    |    4 +-
 docs/en/debian.wml                         |   97 +-
 docs/en/documentation.wml                  |   17 +-
 docs/en/faq-abuse.wml                      |   46 +-
 docs/en/faq.wml                            | 3953 ++++++++++++++--------------
 docs/en/tor-onion-service.wml              |  145 +-
 docs/en/verifying-signatures.wml           |   69 +-
 download/en/download-unix.wml              |    2 +-
 getinvolved/en/volunteer.wml               |   13 +-
 images/people/emmapeel.png                 |  Bin 0 -> 26223 bytes
 images/people/orig/emmapeel.png            |  Bin 0 -> 150954 bytes
 include/foot.wmi                           |   12 +-
 include/versions.wmi                       |    4 +-
 projects/en/gettor.wml                     |    3 +-
 projects/en/projects.wml                   |   10 +
 projects/en/torbrowser.wml                 |   90 +
 projects/torbrowser/RecommendedTBBVersions |   14 +-
 22 files changed, 2468 insertions(+), 2205 deletions(-)

diff --cc docs/en/faq.wml
index 1c639c10,69e4568d..c3c83a38
--- a/docs/en/faq.wml
+++ b/docs/en/faq.wml
@@@ -2077,45 -2048,51 +2048,69 @@@ versions
    #Accept from all interfaces
    SocksListenAddress 0.0.0.0:9100
     </pre>
+ 
+     <p>
+     You can state multiple listen addresses, in the case that you are
+     part of several networks or subnets.
+     </p>
+ 
+     <pre>
+       SocksListenAddress 192.168.x.x:9100 #eth0
+       SocksListenAddress 10.x.x.x:9100 #eth1
+     </pre>
+ 
+     <p>
+     After this, your clients on their respective networks/subnets would specify
+     a socks proxy with the address and port you specified SocksListenAddress
+     to be.
+     </p>
+ 
+     <p>
+     Please note that the SocksPort configuration option gives the port ONLY for
+     localhost (127.0.0.1). When setting up your SocksListenAddress(es), you need
+     to give the port with the address, as shown above.
+     </p>
+ 
+     <p>
+     If you are interested in forcing all outgoing data through the central Tor
+     client/relay, instead of the server only being an optional proxy, you may
+     find the program iptables (for *nix) useful.
+     </p>
+ 
+     <a id="IPv6"></a>
+     <h3><a class="anchor" href="#IPv6">How do I use Tor from an IPv6 only host/computer?</a></h3>
      <p>
- You can state multiple listen addresses, in the case that you are
- part of several networks or subnets.
+     IPv6 is supported since Tor version 0.2.8.x or newer. To activate it add
+     the following two entries into your torrc file:
      </p>
      <pre>
-   SocksListenAddress 192.168.x.x:9100 #eth0
-   SocksListenAddress 10.x.x.x:9100 #eth1
+   ClientUseIPv4 0
+   ClientUseIPv6 1
      </pre>
      <p>
- After this, your clients on their respective networks/subnets would specify
- a socks proxy with the address and port you specified SocksListenAddress
- to be.
-     </p>
-     <p>
- Please note that the SocksPort configuration option gives the port ONLY for
- localhost (127.0.0.1). When setting up your SocksListenAddress(es), you need
- to give the port with the address, as shown above.
-     <p>
- If you are interested in forcing all outgoing data through the central Tor
- client/relay, instead of the server only being an optional proxy, you may find
- the program iptables (for *nix) useful.
+     Note that as of 2018 there aren't many IPv6 users, or IPv6 guards, so Tor over IPv6
+     is less anonymous than Tor over IPv4. You can review the IPv6 implemetation status at our
+     <a href="https://trac.torproject.org/projects/tor/wiki/org/roadmaps/Tor/IPv6Features">IPv6Features</a>
+     wiki page, known issues can be found with the
+     <a href="https://trac.torproject.org/projects/tor/query?status=!closed&keywords=~ipv6">ipv6 keyword</a>.
 +    </p>
 +
 +    <a id="IPv6"></a>
 +    <h3><a class="anchor" href="#IPv6">How do I use Tor from an IPv6 only host/computer?</a></h3>
 +    <p>
 +    IPv6 is supported since Tor version 0.2.8.x or newer. To activate it add
 +    the following two entries into your torrc file:
 +    </p>
 +    <pre>
 +  ClientUseIPv4 0
 +  ClientUseIPv6 1
 +    </pre>
 +    <p>
 +    Note that as of 2018 there aren't many IPv6 users, or IPv6 guards, so Tor over IPv6
 +    is less anonymous than Tor over IPv4. You can review the IPv6 implemetation status at our
 +    <a href="https://trac.torproject.org/projects/tor/wiki/org/roadmaps/Tor/IPv6Features">IPv6Features</a>
 +    wiki page, known issues can be found with the
 +    <a href="https://trac.torproject.org/projects/tor/query?status=!closed&keywords=~ipv6">ipv6 keyword</a>.
      </p>
  
      <hr>