@@ -2453,8 +2453,8 @@ exit

     policies are propagated to Tor clients via the directory, so clients

     will automatically avoid picking exit relays that would refuse to

     exit to their intended destination. This way each relay can decide

-    the services, hosts, and networks he wants to allow connections to,

-    based on abuse potential and his own situation. Read the FAQ entry

+    the services, hosts, and networks it wants to allow connections to,

+    based on abuse potential and its own situation. Read the FAQ entry

 on

     <a href="<page docs/faq-abuse>#TypicalAbuses">issues you might

 encounter</a>

@@ -2931,14 +2931,14 @@ Yes, you do get better anonymity against some attacks.

     </p>

     <p>

 The simplest example is an attacker who owns a small number of Tor relays.

-He will see a connection from you, but he won't be able to know whether

+They will see a connection from you, but they won't be able to know whether

 the connection originated at your computer or was relayed from somebody else.

     </p>

     <p>

 There are some cases where it doesn't seem to help: if an attacker can

-watch all of your incoming and outgoing traffic, then it's easy for him

+watch all of your incoming and outgoing traffic, then it's easy for them

 to learn which connections were relayed and which started at you. (In

-this case he still doesn't know your destinations unless he is watching

+this case they still don't know your destinations unless they are watching

 them too, but you're no better off than if you were an ordinary client.)

     </p>

     <p>

@@ -2948,7 +2948,7 @@ signal to an attacker that you place a high value on your anonymity.

 Second, there are some more esoteric attacks that are not as

 well-understood or well-tested that involve making use of the knowledge

 that you're running a relay -- for example, an attacker may be able to

-"observe" whether you're sending traffic even if he can't actually watch

+"observe" whether you're sending traffic even if they can't actually watch

 your network, by relaying traffic through your Tor relay and noticing

 changes in traffic timing.

     </p>

@@ -3475,7 +3475,7 @@ keys,

     locations, exit policies, and so on. So unless the adversary can

 control

     a majority of the directory authorities (as of 2012 there are 8

-    directory authorities), he can't trick the Tor client into using

+    directory authorities), they can't trick the Tor client into using

     other Tor relays.

     </p>

@@ -4213,7 +4213,7 @@ only solution is to have no opinion.

     Like all anonymous communication networks that are fast enough for web

     browsing, Tor is vulnerable to statistical "traffic confirmation"

     attacks, where the adversary watches traffic at both ends of a circuit

-    and confirms his guess that they're communicating. It would be really

+    and confirms their guess that those endpoints are communicating. It would be really

     nice if we could use cover traffic to confuse this attack. But there

     are three problems here:

     </p>

@@ -148,6 +148,7 @@ country)

     <li><a href="#WhyIsntMyRelayBeingUsedMore">Why isn't my relay being

     used more?</a></li>

     <li><a href="#IDontHaveAStaticIP">Can I run a Tor relay using a dynamic IP address?</a></li>

+    <li><a href="#IPv6Relay">Can I use IPv6 on my relay?</a></li>

     <li><a href="#PortscannedMore">Why do I get portscanned more often

     when I run a Tor relay?</a></li>

     <li><a href="#HighCapacityConnection">How can I get Tor to fully

@@ -2163,6 +2164,18 @@ the program iptables (for *nix) useful.

     <hr>

+    <a id="IPv6Relay"></a>

+    <h3><a class="anchor" href="#IPv6Relay">Can I use IPv6 on my relay?</a></h3>

+

+    <p>

+    Tor has <a href="<wiki>org/roadmaps/Tor/IPv6Features">partial</a> support for IPv6 and we

+    encourage every relay operator to <a href="<wiki>TorRelayGuide#IPv6">enable IPv6 functionality

+    </a> in their torrc configuration files when IPv6 connectivity is available.

+    For the time being Tor will require IPv4 addresses on relays, you can not run a Tor relay

+    on a host with IPv6 addresses only.

+    </p>

+

+    <hr>

     <a id="PortscannedMore"></a>

     <h3><a class="anchor" href="#PortscannedMore">Why do I get portscanned

     more often when I run a Tor relay?</a></h3>

@@ -2556,7 +2556,7 @@ relay or bridge relay?</a></h3>

     <p><a href="<page docs/bridges>">Bridge relays</a> (or "bridges" for

 short)

-    are <a href="<page docs/tor-doc-relay>">Tor relays</a> that aren't

+    are <a href="<wiki>TorRelayGuide">Tor relays</a> that aren't

     listed in the public Tor directory.

     That means that ISPs or governments trying to block access to the

     Tor network can't simply block all bridges.

@@ -2586,9 +2586,10 @@ lots

     of bandwidth, you should definitely run a normal relay.

     If you're willing

     to <a href="#ExitPolicies">be an exit</a>, you should definitely

-    run a normal relay, since we need more exits. If you can't be an

-    exit and only have a little bit of bandwidth, be a bridge. Thanks

-    for volunteering!

+    run an exit relay, since we need more exits. If you can't be an

+    exit and only have a little bit of bandwidth, setup an

+    <a href="<page docs/pluggable-transports>#operator">obfs4 bridge</a>.

+    Thanks for volunteering!

     </p>

     <hr>

@@ -132,6 +132,10 @@ country)

     worry?</a></li>

     <li><a href="#SocksAndDNS">How do I check if my application that uses

     SOCKS is leaking DNS requests?</a></li>

+    <li><a href="#TorClientOnADifferentComputerThanMyApplications">I want to run my Tor client on a

+    different computer than my applications.</a></li>

+    <li><a href="#ServerClient">Can I install Tor on a central server, and

+    have my clients connect to it?</a></li>

     </ul>

     <a id="relay"></a>

@@ -167,10 +171,6 @@ be?</a></li>

     Why did that happen?</a></li>

     <li><a href="#MyRelayRecentlyGotTheGuardFlagAndTrafficDroppedByHalf">My

     relay recently got the Guard flag and traffic dropped by half.</a></li>

-    <li><a href="#TorClientOnADifferentComputerThanMyApplications">I want to run my Tor client on a

-    different computer than my applications.</a></li>

-    <li><a href="#ServerClient">Can I install Tor on a central server, and

-    have my clients connect to it?</a></li>

     <li><a href="#JoinTheNetwork">So I can just configure a nickname and

     ORPort and join the network?</a></li>

     <li><a href="#RelayOrBridge">Should I be a normal relay or bridge

@@ -2027,6 +2027,80 @@ from the source code release tor-0.2.4.16-rc is:

     <hr>

+    <a id="TorClientOnADifferentComputerThanMyApplications"></a>

+    <h3><a class="anchor" href="#TorClientOnADifferentComputerThanMyApplications">I

+    want to run my Tor client on a different computer than my applications.

+    </a></h3>

+    <p>

+    By default, your Tor client only listens for applications that

+    connect from localhost. Connections from other computers are

+    refused. If you want to torify applications on different computers

+    than the Tor client, you should edit your torrc to define

+    SocksListenAddress 0.0.0.0 and then restart (or hup) Tor. If you

+    want to get more advanced, you can configure your Tor client on a

+    firewall to bind to your internal IP but not your external IP.

+    </p>

+

+    <hr>

+

+    <a id="ServerClient"></a>

+    <h3><a class="anchor" href="#ServerClient">Can I install Tor on a

+    central server, and have my clients connect to it?</a></h3>

+    <p>

+     Yes. Tor can be configured as a client or a relay on another

+     machine, and allow other machines to be able to connect to it

+     for anonymity. This is most useful in an environment where many

+     computers want a gateway of anonymity to the rest of the world.

+     However, be forwarned that with this configuration, anyone within

+     your private network (existing between you and the Tor

+     client/relay) can see what traffic you are sending in clear text.

+     The anonymity doesn't start until you get to the Tor relay.

+     Because of this, if you are the controller of your domain and you

+     know everything's locked down, you will be OK, but this configuration

+     may not be suitable for large private networks where security is

+     key all around.

+    </p>

+    <p>

+Configuration is simple, editing your torrc file's SocksListenAddress

+according to the following examples:

+    </p>

+    <pre>

+

+  #This provides local interface access only,

+  #needs SocksPort to be greater than 0

+  SocksListenAddress 127.0.0.1

+

+  #This provides access to Tor on a specified interface

+  SocksListenAddress 192.168.x.x:9100

+

+  #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>

+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>

+

+    <hr>

+

     <a id="RunningATorRelay"></a>

     <h2><a class="anchor" href="#RunningATorRelay">Running a Tor relay:</a></h2>

@@ -2476,80 +2550,6 @@ users

     <hr>

-    <a id="TorClientOnADifferentComputerThanMyApplications"></a>

-    <h3><a class="anchor" href="#TorClientOnADifferentComputerThanMyApplications">I

-    want to run my Tor client on a different computer than my applications.

-    </a></h3>

-    <p>

-    By default, your Tor client only listens for applications that

-    connect from localhost. Connections from other computers are

-    refused. If you want to torify applications on different computers

-    than the Tor client, you should edit your torrc to define

-    SocksListenAddress 0.0.0.0 and then restart (or hup) Tor. If you

-    want to get more advanced, you can configure your Tor client on a

-    firewall to bind to your internal IP but not your external IP.

-    </p>

-

-    <hr>

-

-    <a id="ServerClient"></a>

-    <h3><a class="anchor" href="#ServerClient">Can I install Tor on a

-    central server, and have my clients connect to it?</a></h3>

-    <p>

-     Yes. Tor can be configured as a client or a relay on another

-     machine, and allow other machines to be able to connect to it

-     for anonymity. This is most useful in an environment where many

-     computers want a gateway of anonymity to the rest of the world.

-     However, be forwarned that with this configuration, anyone within

-     your private network (existing between you and the Tor

-     client/relay) can see what traffic you are sending in clear text.

-     The anonymity doesn't start until you get to the Tor relay.

-     Because of this, if you are the controller of your domain and you

-     know everything's locked down, you will be OK, but this configuration

-     may not be suitable for large private networks where security is

-     key all around.

-    </p>

-    <p>

-Configuration is simple, editing your torrc file's SocksListenAddress

-according to the following examples:

-    </p>

-    <pre>

-

-  #This provides local interface access only,

-  #needs SocksPort to be greater than 0

-  SocksListenAddress 127.0.0.1

-

-  #This provides access to Tor on a specified interface

-  SocksListenAddress 192.168.x.x:9100

-

-  #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>

-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>

-

-    <hr>

-

     <a id="RelayOrBridge"></a>

     <h3><a class="anchor" href="#RelayOrBridge">Should I be a normal

 relay or bridge relay?</a></h3>

@@ -2454,12 +2454,10 @@ users

     the BadExit flag why did that happen?</a></h3>

     <p>If you got this flag then we either discovered a problem or suspicious

-    activity coming from your exit and weren't able to contact you. The reason

-    for most flaggings are documented on the <a

-    href="https://trac.torproject.org/projects/tor/wiki/doc/badRelays">bad

-    relays wiki</a>. Please <a

-    href="<page about/contact>">contact us</a> so

-    we can sort out the issue.</p>

+    activity when routing traffic through your exit and weren't able to contact you.

+    Please reach out to the <a href="mailto:bad-relays@lists.torproject.org">bad-relays team</a>

+    so we can sort out the issue.

+    </p>

     <hr>

@@ -143,7 +143,7 @@ country)

     <li><a href="#MostNeededRelayType">What type of relays are most needed?</a></li>

     <li><a href="#WhyIsntMyRelayBeingUsedMore">Why isn't my relay being

     used more?</a></li>

-    <li><a href="#IDontHaveAStaticIP">I don't have a static IP.</a></li>

+    <li><a href="#IDontHaveAStaticIP">Can I run a Tor relay using a dynamic IP address?</a></li>

     <li><a href="#PortscannedMore">Why do I get portscanned more often

     when I run a Tor relay?</a></li>

     <li><a href="#HighCapacityConnection">How can I get Tor to fully

@@ -2079,8 +2079,8 @@ from the source code release tor-0.2.4.16-rc is:

     <hr>

     <a id="IDontHaveAStaticIP"></a>

-    <h3><a class="anchor" href="#IDontHaveAStaticIP">I don't have a static

-    IP.</a></h3>

+    <h3><a class="anchor" href="#IDontHaveAStaticIP">Can I run a Tor relay using a

+    dynamic IP address?</a></h3>

     <p>

     Tor can handle relays with dynamic IP addresses just fine. Just leave

@@ -2149,12 +2149,6 @@ from

 your

     relay, you can set it up to only allow connections to other Tor

 relays.

-    </li>

-    <li>If your relay is behind a NAT and it doesn't know its public

-    IP (e.g. it has an IP of 192.168.x.y), you'll need to set up port

-    forwarding. Forwarding TCP connections is system dependent but

-    <a href="#BehindANAT">this FAQ entry</a>

-    offers some examples on how to do this.

     </li>

     <li>Your relay will passively estimate and advertise its recent

     bandwidth capacity, so high-bandwidth relays will attract more users

@@ -2141,16 +2141,6 @@ need to be?</a></h3>

     sure it's not too often, since connections using the relay when it

     disconnects will break.

     </li>

-    <li>Tor has built-in support for <a

-    href="#BandwidthShaping">

-    rate limiting</a>. Further, if you have a fast

-    link but want to limit the number of bytes per

-    day (or week or month) that you donate, check out the <a

-

-href="#LimitTotalBandwidth">

-hibernation

-    feature</a>.

-    </li>

     <li>Each Tor relay has an <a href="#ExitPolicies">exit policy</a>

 that

     specifies what sort of outbound connections are allowed or refused

@@ -2136,6 +2136,11 @@ need to be?</a></h3>

     </p>

     <ul>

+    <li>It's fine if the relay goes offline sometimes. The directories

+    notice this quickly and stop advertising the relay. Just try to make

+    sure it's not too often, since connections using the relay when it

+    disconnects will break.

+    </li>

     <li>Tor has built-in support for <a

     href="#BandwidthShaping">

     rate limiting</a>. Further, if you have a fast

@@ -2154,11 +2159,6 @@ from

 your

     relay, you can set it up to only allow connections to other Tor

 relays.

-    </li>

-    <li>It's fine if the relay goes offline sometimes. The directories

-    notice this quickly and stop advertising the relay. Just try to make

-    sure it's not too often, since connections using the relay when it

-    disconnects will break.

     </li>

     <li>If your relay is behind a NAT and it doesn't know its public

     IP (e.g. it has an IP of 192.168.x.y), you'll need to set up port

@@ -2160,9 +2160,6 @@ relays.

     sure it's not too often, since connections using the relay when it

     disconnects will break.

     </li>

-    <li>We can handle relays with dynamic IPs just fine &mdash; simply

-    leave the Address config option blank, and Tor will try to guess.

-    </li>

     <li>If your relay is behind a NAT and it doesn't know its public

     IP (e.g. it has an IP of 192.168.x.y), you'll need to set up port

     forwarding. Forwarding TCP connections is system dependent but

@@ -140,6 +140,7 @@ country)

     <li><a href="#HowDoIDecide">How do I decide if I should run a relay?

     </a></li>

+    <li><a href="#MostNeededRelayType">What type of relays are most needed?</a></li>

     <li><a href="#WhyIsntMyRelayBeingUsedMore">Why isn't my relay being

     used more?</a></li>

     <li><a href="#IDontHaveAStaticIP">I don't have a static IP.</a></li>

@@ -2043,6 +2044,19 @@ from the source code release tor-0.2.4.16-rc is:

     <hr>

+    <a id="MostNeededRelayType"></a>

+    <h3><a class="anchor" href="#MostNeededRelayType">What type of relays are most needed?</a></h3>

+    <p>

+    <ul>

+    <li>The exit relay is the most needed relay type but it also comes with the highest legal exposure and risk (and you

+    should NOT run them from your home).</li>

+    <li>If you are looking to run a relay with minimal effort, fast guard relays are also very useful</li>

+    <li>followed by bridges.</li>

+    </ul>

+    </p>

+

+    <hr>

+

     <a id="WhyIsntMyRelayBeingUsedMore"></a>

     <h3><a class="anchor" href="#WhyIsntMyRelayBeingUsedMore">Why isn't my

     relay being used more?</a></h3>

@@ -2034,9 +2034,11 @@ from the source code release tor-0.2.4.16-rc is:

     run a relay?</a></h3>

     <p>

     We're looking for people with reasonably reliable Internet connections,

-    that have at least 250 kilobytes/second each way. If that's you, please

-    consider <a href="https://www.torproject.org/docs/tor-relay-debian">helping

-    out</a>.

+    that have at least 1 MByte/second (that is 8 MBit/second) available bandwidth each way. If that's you, please

+    consider <a href="<wiki>TorRelayGuide">running a Tor relay</a>.

+    </p>

+    <p>

+    Even if you do not have at least 8 MBit/s of available bandwidth you can still help the Tor network by running a <a href="<page docs/pluggable-transports>#operator">Tor bridge with obfs4 support</a>. In that case you should have at least 1 MBit/s of available bandwidth.

     </p>

     <hr>

@@ -1514,7 +1514,7 @@ href="http://www.crowdstrike.com/community-tools/index.html#tool-79">proposed

     Tor Browser? How do I verify a build?</a></h3>

     <p>

-    Start with <a href="https://gitweb.torproject.org/builders/tor-browser-bundle.git">https://gitweb.torproject.org/builders/tor-browser-bundle.git</a> and <a href="https://gitweb.torproject.org/builders/tor-browser-bundle.git/tree/gitian/README.build">https://gitweb.torproject.org/builders/tor-browser-bundle.git/tree/gitian/README.build</a>.

+    Tor Browser is built from the <a href="https://gitweb.torproject.org/builders/tor-browser-build.git/">tor-browser-build.git git repository</a>. You can have a look at the <a href="https://gitweb.torproject.org/builders/tor-browser-build.git/tree/README">README file</a> for the build instructions. There is also some informations in the <a href="https://trac.torproject.org/projects/tor/wiki/doc/TorBrowser/Hacking">Tor Browser Hacking Guide</a>.

     </p>

@@ -287,7 +287,7 @@ things?</a></li>

     <hr>

     <a id="General"></a>

-    <h2><a class="anchor">General:</a></h2>

+    <h2><a class="anchor" href="#General">General:</a></h2>

     <a id="WhatIsTor"></a>

     <h3><a class="anchor" href="#WhatIsTor">What is Tor?</a></h3>

@@ -889,7 +889,7 @@ executive

     <hr>

     <a id="CompilationAndInstallation"></a>

-    <h2><a class="anchor">Compilation And Installation:</a></h2>

+    <h2><a class="anchor" href="#CompilationAndInstallation">Compilation And Installation:</a></h2>

     <a id="HowUninstallTor"></a>

     <h3><a class="anchor" href="#HowUninstallTor">How do I uninstall

@@ -1025,7 +1025,7 @@ bundle that includes Tor?</a></h3>

 <hr>

 <a id="TBBGeneral"></a>

-<h2><a class="anchor">Tor Browser (general):</a></h2>

+<h2><a class="anchor" href="#TBBGeneral">Tor Browser (general):</a></h2>

 <a id="TBBFlash"></a>

 <h3><a class="anchor" href="#TBBFlash">Why can't I view videos on

@@ -1380,7 +1380,7 @@ href="http://www.crowdstrike.com/community-tools/index.html#tool-79">proposed

 <hr>

 <a id="TBB3.x"></a>

-<h2><a class="anchor">Tor Browser (3.x and later):</a></h2>

+<h2><a class="anchor" href="#TBB3.x">Tor Browser (3.x and later):</a></h2>

     <a id="WhereDidVidaliaGo"></a>

     <h3><a class="anchor" href="#WhereDidVidaliaGo">Where did the world map

     (Vidalia) go?</a></h3>

@@ -1510,7 +1510,7 @@ href="http://www.crowdstrike.com/community-tools/index.html#tool-79">proposed

 <hr>

 <a id="AdvancedTorUsage"></a>

-<h2><a class="anchor">Advanced Tor usage:</a></h2>

+<h2><a class="anchor" href="#AdvancedTorUsage">Advanced Tor usage:</a></h2>

 <a id="torrc"></a>

 <h3><a class="anchor" href="#torrc">I'm supposed to "edit my torrc".

@@ -2016,7 +2016,7 @@ from the source code release tor-0.2.4.16-rc is:

     <hr>

     <a id="RunningATorRelay"></a>

-    <h2><a class="anchor">Running a Tor relay:</a></h2>

+    <h2><a class="anchor" href="#RunningATorRelay">Running a Tor relay:</a></h2>

     <a id="HowDoIDecide"></a>

     <h3><a class="anchor" href="#HowDoIDecide">How do I decide if I should

@@ -3000,7 +3000,7 @@ diversity,

 # Leaving in old ids to accomodate incoming links.

 <a id="TorOnionServices"></a><a id="TorHiddenServices"></a>

-<h2><a class="anchor">Tor onion services:</a></h2>

+<h2><a class="anchor" href="#TorOnionServices">Tor onion services:</a></h2>

     <a id="AccessOnionServices"></a><a id="AccessHiddenServices"></a>

     <h3><a class="anchor" href="#AccessOnionServices">How do I access

@@ -3066,7 +3066,7 @@ diversity,

     <hr>

     <a id="Development"></a>

-    <h2><a class="anchor">Development:</a></h2>

+    <h2><a class="anchor" href="#Development">Development:</a></h2>

     <a id="VersionNumbers"></a>

     <h3><a class="anchor" href="#VersionNumbers">What do these weird

@@ -3245,7 +3245,7 @@ diversity,

     <hr>

     <a id="AnonymityAndSecurity"></a>

-    <h2><a class="anchor">Anonymity And Security:</a></h2>

+    <h2><a class="anchor" href="#AnonymityAndSecurity">Anonymity And Security:</a></h2>

     <a id="WhatProtectionsDoesTorProvide"></a>

     <h3><a class="anchor" href="#WhatProtectionsDoesTorProvide">What

@@ -3777,7 +3777,7 @@ Perhaps even run separate Tor clients for these applications.

     <hr>

     <a id="AlternateDesigns"></a>

-    <h2><a class="anchor">Alternate designs:</a></h2>

+    <h2><a class="anchor" href="#AlternateDesigns">Alternate designs:</a></h2>

     <a id="EverybodyARelay"></a>

     <h3><a class="anchor" href="#EverybodyARelay">You should make every

@@ -4251,7 +4251,7 @@ only solution is to have no opinion.

     <hr>

     <a id="Abuse"></a>

-    <h2><a class="anchor">Abuse:</a></h2>

+    <h2><a class="anchor" href="#Abuse">Abuse:</a></h2>

     <a id="Criminals"></a>

     <h3><a class="anchor" href="#Criminals">Doesn't Tor enable criminals

@@ -14,7 +14,8 @@

     <h1>Tor FAQ</h1>

     <hr>

-    <p>General questions:</p>

+    <a id="general"></a>

+    <h4 style="margin-bottom: 18px"><a class="anchor" href="#general">General questions:</a></h4>

     <ul>

     <li><a href="#WhatIsTor">What is Tor?</a></li>

     <li><a href="#Torisdifferent">How is Tor different from other

@@ -43,7 +44,8 @@ proxies?</a></li>

     exit nodes are there?</a></li>

     </ul>

-    <p>Compilation and Installation:</p>

+    <a id="comp-install"></a>

+    <h4 style="margin-bottom: 18px"><a class="anchor" href="#comp-install">Compilation and Installation:</a></h4>

     <ul>

     <li><a href="#HowUninstallTor">How do I uninstall Tor?</a></li>

@@ -58,7 +60,8 @@ proxies?</a></li>

 includes Tor?</a></li>

     </ul>

-    <p>Tor Browser (general):</p>

+    <a id="tbb"></a>

+    <h4 style="margin-bottom: 18px"><a class="anchor" href="#tbb">Tor Browser (general):</a></h4>

     <ul>

     <li><a href="#TBBFlash">Why can't I view videos on YouTube and other

@@ -90,7 +93,8 @@ unsafe?</a></li>

     with my application?</a></li>

     </ul>

-    <p>Tor Browser (3.x and later):</p>

+    <a id="tbb-3plus"></a>

+    <h4 style="margin-bottom: 18px"><a class="anchor" href="#tbb-3plus">Tor Browser (3.x and later):</a></h4>

     <ul>

     <li><a href="#DisableJS">How do I disable JavaScript?</a></li>

@@ -105,7 +109,8 @@ unsafe?</a></li>

     How do I verify a build?</a></li>

     </ul>

-    <p>Advanced Tor usage:</p>

+    <a id="advanced"></a>

+    <h4 style="margin-bottom: 18px"><a class="anchor" href="#advanced">Advanced Tor usage:</a></h4>

     <ul>

     <li><a href="#torrc">I'm supposed to "edit my torrc". What does

@@ -129,7 +134,8 @@ country)

     SOCKS is leaking DNS requests?</a></li>

     </ul>

-    <p>Running a Tor relay:</p>

+    <a id="relay"></a>

+    <h4 style="margin-bottom: 18px"><a class="anchor" href="#relay">Running a Tor relay:</a></h4>

     <ul>

     <li><a href="#HowDoIDecide">How do I decide if I should run a relay?

@@ -191,14 +197,16 @@ relay.</a></li>

     run my own?</a></li>

     </ul>

-    <p>Tor onion services:</p>

+    <a id="onion-services"></a>

+    <h4 style="margin-bottom: 18px"><a class="anchor" href="#onion-services">Tor onion services:</a></h4>

     <ul>

     <li><a href="#AccessOnionServices">How do I access onion services?</a></li>

     <li><a href="#ProvideAnOnionService">How do I provide an onion service?</a></li>

     </ul>

-    <p>Development:</p>

+    <a id="dev"></a>

+    <h4 style="margin-bottom: 18px"><a class="anchor" href="#dev">Development:</a></h4>

     <ul>

     <li><a href="#VersionNumbers">What do these weird version numbers

@@ -212,7 +220,8 @@ relay.</a></li>

     into Tor?</a></li>

     </ul>

-    <p>Anonymity and Security:</p>

+    <a id="anonsec"></a>

+    <h4 style="margin-bottom: 18px"><a class="anchor" href="#anonsec">Anonymity and Security:</a></h4>

     <ul>

     <li><a href="#WhatProtectionsDoesTorProvide">What protections does Tor

     provide?</a></li>

@@ -240,7 +249,8 @@ uses.</a></li>

     <li><a href="#LearnMoreAboutAnonymity">Where can I learn more about anonymity?</a></li>

     </ul>

-    <p>Alternate designs that we don't do (yet):</p>

+    <a id="altdesigns"></a>

+    <h4 style="margin-bottom: 18px"><a class="anchor" href="#altdesigns">Alternate designs that we don't do (yet):</a></h4>

     <ul>

     <li><a href="#EverybodyARelay">You should make every Tor user be a

@@ -270,7 +280,8 @@ packets,

     traffic.</a></li>

     </ul>

-    <p>Abuse:</p>

+    <a id="abuse"></a>

+    <h4 style="margin-bottom: 18px"><a class="anchor" href="#abuse">Abuse:</a></h4>

     <ul>

     <li><a href="#Criminals">Doesn't Tor enable criminals to do bad

 things?</a></li>

@@ -3062,7 +3062,7 @@ diversity,

     onion service?</a></h3>

     <p>

-    See the <a href="<page docs/tor-hidden-service>">

+    See the <a href="<page docs/tor-onion-service>">

     official onion service configuration instructions</a>.

     </p>

@@ -191,11 +191,11 @@ relay.</a></li>

     run my own?</a></li>

     </ul>

-    <p>Tor hidden services:</p>

+    <p>Tor onion services:</p>

     <ul>

-    <li><a href="#AccessHiddenServices">How do I access hidden services?</a></li>

-    <li><a href="#ProvideAHiddenService">How do I provide a hidden service?</a></li>

+    <li><a href="#AccessOnionServices">How do I access onion services?</a></li>

+    <li><a href="#ProvideAnOnionService">How do I provide an onion service?</a></li>

     </ul>

     <p>Development:</p>

@@ -1817,7 +1817,7 @@ versions.

     <p>

     Note also that not every circuit is used to deliver traffic outside of

     the Tor network. It is normal to see non-exit circuits (such as those

-    used to connect to hidden services, those that do directory fetches,

+    used to connect to onion services, those that do directory fetches,

     those used for relay reachability self-tests, and so on) that end at

     a non-exit node. To keep a node from being used entirely, see

     <tt>ExcludeNodes</tt> and <tt>StrictNodes</tt> in the

@@ -3001,15 +3001,16 @@ diversity,

     <hr>

-<a id="TorHiddenServices"></a>

-<h2><a class="anchor">Tor hidden services:</a></h2>

+# Leaving in old ids to accomodate incoming links.

+<a id="TorOnionServices"></a><a id="TorHiddenServices"></a>

+<h2><a class="anchor">Tor onion services:</a></h2>

-    <a id="AccessHiddenServices"></a>

-    <h3><a class="anchor" href="#AccessHiddenServices">How do I access

-    hidden services?</a></h3>

+    <a id="AccessOnionServices"></a><a id="AccessHiddenServices"></a>

+    <h3><a class="anchor" href="#AccessOnionServices">How do I access

+    onion services?</a></h3>

     <p>

-    Tor hidden services are named with a special top-level domain (TLD)

+    Tor onion services are named with a special top-level domain (TLD)

     name in DNS: .onion. Since the .onion TLD is not recognized by the

     official root DNS servers on the Internet, your application will not

     get the response it needs to locate the service. Currently, the Tor

@@ -3020,7 +3021,7 @@ diversity,

 <p>

  Therefore, your application <b>needs</b> to pass the .onion hostname to

  Tor directly. You can't try to resolve it to an IP address, since there

- <i>is</i> no corresponding IP address: the server is hidden, after all!

+ <i>is</i> no corresponding IP address.

 </p>

     <p>

@@ -3044,10 +3045,10 @@ diversity,

     <p>

     For applications that do not support HTTP proxy, and so cannot use

     Polipo, <a href="http://www.freecap.ru/eng/">FreeCap</a> is an

-    alternative. When using FreeCap set proxy protocol  to SOCKS 5 and under

+    alternative. When using FreeCap set proxy protocol to SOCKS 5 and under

     settings set DNS name resolving to remote. This

     will allow you to use almost any program with Tor without leaking DNS

-    lookups and allow those same programs to access hidden services.

+    lookups and allow those same programs to access onion services.

     </p>

     <p>

@@ -3056,13 +3057,13 @@ diversity,

     <hr>

-    <a id="ProvideAHiddenService"></a>

-    <h3><a class="anchor" href="#ProvideAHiddenService">How do I provide a

-    hidden service?</a></h3>

+    <a id="ProvideAnOnionService"></a><a id="ProvideAHiddenService"></a>

+    <h3><a class="anchor" href="#ProvideAnOnionService">How do I provide an

+    onion service?</a></h3>

     <p>

     See the <a href="<page docs/tor-hidden-service>">

-    official hidden service configuration instructions</a>.

+    official onion service configuration instructions</a>.

     </p>

     <hr>

@@ -3951,7 +3952,7 @@ and clients need to predict all the packets they will want to send in

 a session before picking their exit node!

 </li>

 <li>The Tor-internal name spaces would need to be redesigned. We support

-hidden service ".onion" addresses by intercepting the addresses when

+onion service ".onion" addresses by intercepting the addresses when

 they are passed to the Tor client. Doing so at the IP level will require

 a more complex interface between Tor and the local DNS resolver.

 </li>

@@ -4002,7 +4003,7 @@ their path length.</a></h3>

 <p>

  Right now the path length is hard-coded at 3 plus the number of nodes in

  your path that are sensitive. That is, in normal cases it's 3, but for

- example if you're accessing a hidden service or a ".exit" address it could be 4.

+ example if you're accessing an onion service or a ".exit" address it could be 4.

 </p>

 <p>

  We don't want to encourage people to use paths longer than this — it

@@ -682,7 +682,7 @@ with more funding?</a></h3>

     <p>

     The Tor network's <a

-href="https://metrics.torproject.org/networksize.html">serveral thousand</a>

+href="https://metrics.torproject.org/networksize.html">several thousand</a>

     relays push <a

 href="https://metrics.torproject.org/bandwidth.html">around 100 Gbps on

 average</a>. We have <a

@@ -682,15 +682,12 @@ with more funding?</a></h3>

     <p>

     The Tor network's <a

-

-href="https://metrics.torproject.org/network.html#networksize">several

-    thousand</a> relays push <a

-    href="https://metrics.torproject.org/network.html#bandwidth">over

-    7.5GB per second on average</a>. We have <a

-

-href="https://metrics.torproject.org/users.html#direct-users">millions of

-    daily users</a>. But the Tor network is not yet

-    self-sustaining.

+href="https://metrics.torproject.org/networksize.html">serveral thousand</a>

+    relays push <a

+href="https://metrics.torproject.org/bandwidth.html">around 100 Gbps on

+average</a>. We have <a

+href="https://metrics.torproject.org/userstats-relay-country.html">millions of

+    daily users</a>. But the Tor network is not yet self-sustaining.

     </p>

     <p>

@@ -1525,15 +1525,19 @@ instructions for how your Tor program should behave. The default

 configuration should work fine for most Tor users.

 </p>

 <p>

-If you installed Tor Browser, look for

+If you installed Tor Browser on Windows or Linux, look for

 <code>Browser/TorBrowser/Data/Tor/torrc</code> inside your Tor Browser

 directory.

-On OS X, you must right-click or command-click on the Tor Browser icon,

-and select "Show Package Contents" before the Tor Browser directories become

-visible.

+If you're on macOS, the torrc is in <code>~/Library/Application Support/TorBrowser-Data/Tor</code> .

+To get to it, press cmd-shift-g while in Finder and copy/paste that directory

+into the box that appears.

 </p>

 <p>

-Tor looks for the torrc file in <code>/usr/local/etc/tor/torrc</code> if you compiled tor from source, and <code>/etc/tor/torrc</code> or <code>/etc/torrc</code> if you installed a pre-built package.</p>

+Otherwise, if you are using Tor without Tor Browser, it looks for the

+torrc file in <code>/usr/local/etc/tor/torrc</code> if you compiled tor

+from source, and <code>/etc/tor/torrc</code> or <code>/etc/torrc</code>

+if you installed a pre-built package.

+</p>

 <p>

 Once you've created or changed your torrc file, you will need to restart

@@ -1389,10 +1389,7 @@ href="http://www.crowdstrike.com/community-tools/index.html#tool-79">proposed

     (Vidalia) go?</a></h3>

     <p>Vidalia has been replaced with Tor Launcher, which is a Firefox

-    extension that provides similar functionality. Unfortunately, circuit

-    status reporting is still missing, but we are <a

-    href="https://trac.torproject.org/projects/tor/ticket/8641">working

-    on providing it</a>. </p>

+    extension that provides similar functionality.</p>

     <hr>

@@ -2192,7 +2192,7 @@ too.

     second). For example, you might want to choose "BandwidthRate 10 MBytes"

     for 10 megabytes per second (a fast connection), or "BandwidthRate 500

     KBytes" for 500 kilobytes per second (a decent cable connection).

-    The minimum BandwidthRate setting is 20 kilobytes per second.

+    The minimum BandwidthRate setting is 75 kilobytes per second.

     </li>

     <li>

     BandwidthBurst is a pool of bytes used to fulfill requests during