@@ -1142,11 +1142,11 @@ use the ReachableAddresses config options, e.g.:

     <ul>

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

-    href="<wikifaq>#LimitBandwidth">

+    href="<wikifaq>#WhatbandwidthshapingoptionsareavailabletoTorrelays">

     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="<wikifaq>#Hibernation">hibernation

+    href="<wikifaq>#HowcanIlimitthetotalamountofbandwidthusedbymyTorrelay">hibernation

     feature</a>.

     </li>

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

@@ -1165,7 +1165,7 @@ use the ReachableAddresses config options, e.g.:

     <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="<wikifaq>#ServerForFirewalledClients">this FAQ entry</a>

+    <a href="<wikifaq>#ImbehindaNATFirewall">this FAQ entry</a>

     offers some examples on how to do this.

     </li>

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

@@ -1201,7 +1201,7 @@ use the ReachableAddresses config options, e.g.:

     <p>

     The default exit policy allows access to many popular services

-    (e.g. web browsing), but <a href="<wikifaq>#DefaultPorts">restricts</a>

+    (e.g. web browsing), but <a href="<wikifaq>#Istherealistofdefaultexitports">restricts</a>

     some due to abuse potential (e.g. mail) and some since

     the Tor network can't handle the load (e.g. default

     file-sharing ports). You can change your exit policy

@@ -1323,7 +1323,7 @@ the same geographic location.

     <li>If you're running on Solaris, OpenBSD, NetBSD, or

     old FreeBSD, Tor is probably forking separate processes

     rather than using threads. Consider switching to a <a

-    href="<wikifaq>#RelayOS">better

+    href="<wikifaq>#WhydoesntmyWindowsorotherOSTorrelayrunwell">better

     operating system</a>.</li>

     <li>If you still can't handle the memory load, consider reducing the

@@ -1492,7 +1492,8 @@ we move to a "directory guard" design as well.

     <p>

     Requiring every Tor user to be a relay would help with scaling the

-    network to handle all our users, and <a href="<wikifaq>#RelayAnonymity">running a Tor

+    network to handle all our users, and <a

+    href="<wikifaq>#DoIgetbetteranonymityifIrunarelay">running a Tor

     relay may help your anonymity</a>. However, many Tor users cannot be good

     relays — for example, some Tor clients operate from behind restrictive

     firewalls, connect via modem, or otherwise aren't in a position where they

@@ -1529,7 +1530,7 @@ we move to a "directory guard" design as well.

     <a href="<page getinvolved/volunteer>#Research">research section of the

     volunteer page</a>: "Tor doesn't work very well when relays

     have asymmetric bandwidth (e.g. cable or DSL)". It might be that <a

-    href="<wikifaq>#TransportIPnotTCP">switching

+    href="<wikifaq>#YoushouldtransportallIPpacketsnotjustTCPpackets.">switching

     to UDP transport</a> is the simplest answer here &mdash; which alas is

     not a very simple answer at all.

     </p>