Fix merge conflicts
hiro

hiro commited on 2018-08-22 12:25:54
Zeige 1 geänderte Dateien mit 7 Einfügungen und 4 Löschungen.

... ...
@@@ -282,9 -294,21 +295,9 @@@
294 295
      traffic.</a></li>
295 296
      </ul>
296 297
  
297 298
 -    <a id="abuse"></a>
298 299
 -    <h4 style="margin-bottom: 18px"><a class="anchor" href="#abuse">Abuse:
299 300
 -    </a></h4>
300 301
 -    <ul>
301 302
 -    <li><a href="#Criminals">Doesn't Tor enable criminals to do bad things?
302 303
 -    </a></li>
303 304
 -    <li><a href="#RespondISP">How do I respond to my ISP about my exit
304 305
 -    relay?</a></li>
305 306
 -    <li><a href="#HelpPoliceOrLawyers">I have questions about a Tor IP address
306 307
 -    for a legal case.</a></li>
307 308
 -    </ul>
308 309
 -
309 310
      <p>For other questions not yet on this version of the FAQ, see the
310
- <a
311
-     href="<wikifaq>">wiki FAQ</a> for now.</p>
311
+     <a href="<wikifaq>">wiki FAQ</a> for now.
312
+     </p>
312 313
  
313 314
      <hr>
314 315
  
... ...
@@@ -2116,30 -2080,14 +2069,32 @@@ versions
2080 2069
      Please note that the SocksPort configuration option gives the port ONLY for
2081 2070
      localhost (127.0.0.1). When setting up your SocksListenAddress(es), you need
2082 2071
      to give the port with the address, as shown above.
2072
+     </p>
2073
+ 
2083 2074
      <p>
2084 2075
      If you are interested in forcing all outgoing data through the central Tor
2085
- client/relay, instead of the server only being an optional proxy, you may find
2086
- the program iptables (for *nix) useful.
2076
+     client/relay, instead of the server only being an optional proxy, you may
2077
+     find the program iptables (for *nix) useful.
2087 2078
      </p>
2088 2079
  
2089 2080
 +    <a id="IPv6"></a>
2090 2081
 +    <h3><a class="anchor" href="#IPv6">How do I use Tor from an IPv6 only host/computer?</a></h3>
2091 2082
 +    <p>
2092 2083
 +    IPv6 is supported since Tor version 0.2.8.x or newer. To activate it add
2093 2084
 +    the following two entries into your torrc file:
2094 2085
 +    </p>
2095 2086
 +    <pre>
2096 2087
 +  ClientUseIPv4 0
2097 2088
 +  ClientUseIPv6 1
2098 2089
 +    </pre>
2099 2090
 +    <p>
2100 2091
 +    Note that as of 2018 there aren't many IPv6 users, or IPv6 guards, so Tor over IPv6
2101 2092
 +    is less anonymous than Tor over IPv4. You can review the IPv6 implemetation status at our
2102 2093
 +    <a href="https://trac.torproject.org/projects/tor/wiki/org/roadmaps/Tor/IPv6Features">IPv6Features</a>
2103 2094
 +    wiki page, known issues can be found with the
2104 2095
 +    <a href="https://trac.torproject.org/projects/tor/query?status=!closed&keywords=~ipv6">ipv6 keyword</a>.
2105 2096
 +    </p>
2106 2097
 +
2107 2098
      <hr>
2108 2099
  
2109 2100
      <a id="RunningATorRelay"></a>
... ...
@@@ -4087,6 -3973,6 +3980,7 @@@ Perhaps even run separate Tor clients f
3973 3980
      spend rethinking their overall approach to privacy and anonymity.
3974 3981
      </li>
3975 3982
      </ol>
3983
++>>>>>>> faq-datadir
3976 3984
  
3977 3985
      <hr>
3978 3986
  
3979 3987