tor-webwml.git

@@ -114,7 +114,7 @@

     <h3><a class="anchor" href="#ExitPolicies">How do Tor exit policies work?</a></h3>

     <p>

-    <a href="<page docs/faq>#ExitPolicies">Moved to the new FAQ page</a>

+    <a href="<wiki>TorFAQ#ExitPolicies">See the FAQ</a>

     </p>

     <a id="HowMuchAbuse"></a>

@@ -295,7 +295,7 @@

     not so different from AOL in this respect.</p>

     <p>Lastly, please remember that Tor relays have <a

-    href="<page docs/faq>#ExitPolicies">individual exit policies</a>. Many Tor relays do

+    href="<wiki>#ExitPolicies">individual exit policies</a>. Many Tor relays do

     not allow exiting connections at all. Many of those that do allow some

     exit connections might already disallow connections to

     your service. When you go about banning nodes, you should parse the

@@ -327,7 +327,7 @@

     <p>

     Some fans have suggested that we redesign Tor to include a <a

-    href="<page docs/faq>#Backdoor">backdoor</a>.

+    href="<wikifaq>#Backdoor">backdoor</a>.

     There are two problems with this idea. First, it technically weakens the

     system too far. Having a central way to link users to their activities

     is a gaping hole for all sorts of attackers; and the policy mechanisms

@@ -60,9 +60,9 @@

        'url'  => '<wiki>',

        'txt'  => 'Tor Wiki',

       }, 

-      {'url'  => 'docs/faq',

-       'txt'  => 'FAQ',  #maybe stick this in about instead...

-       'subelements' => [

+      {'url'  => '<wikifaq>',

+       'txt'  => 'General FAQ',  

+      },

       {'url'  => 'docs/faq-abuse',

        'txt'  => 'Abuse FAQ',

       },

@@ -74,7 +74,6 @@

       },

       {'url'  => 'eff/tor-dmca-response',

        'txt'  => 'Tor DMCA Response',

-          }]

       },  

   ];

 :>

@@ -84,7 +84,7 @@

     <p>

     If you plan to run Firefox on a different computer than Tor, see the <a

-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#SocksListenAddress">FAQ

+    href="<wikifaq>#SocksListenAddress">FAQ

     entry for running Tor on a different computer</a>.

     </p>

@@ -92,14 +92,14 @@

     point them at Polipo (that is, localhost port 8118). To use SOCKS

     directly (for instant messaging, Jabber, IRC, etc), you can point

     your application directly at Tor (localhost port 9050), but see <a

-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#SOCKSAndDNS">this

+    href="<wikifaq>#SOCKSAndDNS">this

     FAQ entry</a> for why this may be dangerous. For applications

     that support neither SOCKS nor HTTP, take a look at <a

     href="http://www.taiyo.co.jp/~gotoh/ssh/connect.html">connect</a> or

     <a href="http://www.dest-unreach.org/socat/">socat</a>.</p>

     <p>For information on how to Torify other applications, check out the

-    <a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO">Torify

+    <a href="<wiki>/TheOnionRouter/TorifyHOWTO">Torify

     HOWTO</a>.

     </p>

@@ -115,7 +115,7 @@

     Tor detector</a>

     and see whether it thinks you're using Tor or not.

     (If that site is down, see <a

-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#IsMyConnectionPrivate">this

+    href="<wikifaq>#IsMyConnectionPrivate">this

     FAQ entry</a> for more suggestions on how to test your Tor.)

     </p>

@@ -124,12 +124,12 @@

     your local applications to local port 8118 and port 9050. If

     your firewall blocks outgoing connections, punch a hole so

     it can connect to at least TCP ports 80 and 443, and then see <a

-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#FirewalledClient">this

+    href="<wikifaq>#FirewalledClient">this

     FAQ entry</a>.

     </p>

     <p>If it's still not working, look at <a

-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork">this

+    href="<wikifaq>#ItDoesntWork">this

     FAQ entry</a> for hints.</p>

     <p>

@@ -153,7 +153,7 @@

     <p>Having relays in many different places on the Internet is what

     makes Tor users secure. <a

-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayAnonymity">You

+    href="<wikifaq>#RelayAnonymity">You

     may also get stronger anonymity yourself</a>,

     since remote sites can't know whether connections originated at your

     computer or were relayed from others.</p>

@@ -32,13 +32,12 @@

     people who run relays, the faster the Tor network will be. If you have

     at least 20 kilobytes/s each way, please help out Tor by configuring your

     Tor to be a relay too. We have many features that make Tor relays easy

-    and convenient, including <a href="<page docs/faq>#RelayFlexible">rate limiting

+    and convenient, including <a href="<wiki>TorFAQ#RelayFlexible">rate limiting

     for bandwidth, exit policies so you can limit your exposure to abuse

     complaints, and support for dynamic IP addresses</a>.

     </p>

-    <p>You can run a Tor relay on <a

-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayOS">pretty

+    <p>You can run a Tor relay on <a href="<wiki>/TorFAQ#RelayOS">pretty

     much any</a> operating system. Tor relays work best on Linux, OS X Tiger

     or later, FreeBSD 5.x+, NetBSD 5.x+, and Windows Server 2003 or later.

     </p>

@@ -81,7 +80,10 @@

     <li>Click <tt>Setup Relaying</tt>.</li>

     <li>

-    	<dt>Choose <tt>Relay Traffic for the Tor network</tt> if you want to be a public relay (recommended), or choose 		<tt>Help censored users reach the Tor network</tt> if you want to be a <a href="<page docs/faq>#RelayOrBridge">bridge</a> for users in countries that censor their Internet.</dt>

+    	<dt>Choose <tt>Relay Traffic for the Tor network</tt> if you

+want to be a public relay (recommended), or choose 		<tt>Help

+censored users reach the Tor network</tt> if you want to be a <a

+href="<wiki>TorFAQ#RelayOrBridge">bridge</a> for users in countries that censor their Internet.</dt>

     <dd><img alt="vidalia basic settings" src="../img/screenshot-win32-configure-relay-1.png"></dd>

     </li>

@@ -98,8 +100,7 @@

     <li><dt>Choose the <tt>Exit Policies</tt> tab.  If you want to allow others

     to use your relay for these services, don't change anything.  Un-check

-    the services you don't want to allow people to <a href="<page

-    docs/faq>#ExitPolicies">reach from your relay</a>.  If you want to be a non-exit relay, un-check all services.</dt>

+    the services you don't want to allow people to <a href="<wiki>TorFAQ#ExitPolicies">reach from your relay</a>.  If you want to be a non-exit relay, un-check all services.</dt>

     <dd><img alt="vidalia exit policies" src="../img/screenshot-win32-configure-relay-3.png"></dd>

     </li>

@@ -110,12 +111,9 @@

     <br />

     <strong>Manual Configuration</strong>:

     <ul>

-    <li>Edit the bottom part of <a

-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc">your

-    torrc file</a>. If you want to be a public relay (recommended),

-    make sure to define ORPort and <a href="<page

-    docs/faq>#ExitPolicies">look at ExitPolicy</a>; otherwise

-    if you want to be a <a href="<page docs/faq>#RelayOrBridge">bridge</a>

+    <li>Edit the bottom part of <a href="<wiki>/TorFAQ#torrc">your torrc file</a>. If you want to be a public relay (recommended),

+    make sure to define ORPort and <a href="<wiki>TorFAQ#ExitPolicies">look at ExitPolicy</a>; otherwise

+    if you want to be a <a href="<wiki>TorFAQ#RelayOrBridge">bridge</a>

     for users in countries that censor their Internet,

     just use <a href="<page docs/bridges>#RunningABridge">these lines</a>.

     </li>

@@ -132,7 +130,7 @@

     </li>

     <li>Restart your relay. If it <a

-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#Logs">logs

+    href="<wikifaq>#Logs">logs

     any warnings</a>, address them.

     </li>

@@ -155,7 +153,7 @@

     try to determine whether the ports you configured are reachable from

     the outside. This step is usually fast, but may take up to 20

     minutes. Look for a

-    <a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#Logs">log

+    <a href="<wikifaq>#Logs">log

     entry</a> like

     <tt>Self-testing indicates your ORPort is reachable from the outside. Excellent.</tt>

     If you don't see this message, it means that your relay is not reachable

@@ -183,13 +181,13 @@

     <p>

     6. Read

-    <a href="https://wiki.torproject.org/noreply/TheOnionRouter/OperationalSecurity">about operational security</a>

+    <a href="<wiki>TheOnionRouter/OperationalSecurity">about operational security</a>

     to get ideas how you can increase the security of your relay.

     </p>

     <p>

     7. If you want to run more than one relay that's great, but please set <a

-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#MultipleRelays">the

+    href="<wikifaq>#MultipleRelays">the

     MyFamily option</a> in all your relays' configuration files.

     </p>

@@ -197,7 +195,7 @@

     8. Decide about rate limiting. Cable modem, DSL, and other users

     who have asymmetric bandwidth (e.g. more down than up) should

     rate limit to their slower bandwidth, to avoid congestion. See the <a

-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#LimitBandwidth">rate

+    href="<wikifaq>#LimitBandwidth">rate

     limiting FAQ entry</a> for details.

     </p>

@@ -206,7 +204,7 @@

     in your DataDirectory). This is your relay's "identity," and

     you need to keep it safe so nobody can read the traffic that goes

     through your relay. This is the critical file to keep if you need to <a

-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#UpgradeRelay">move

+    href="<wikifaq>#UpgradeRelay">move

     or restore your Tor relay</a> if something goes wrong.

     </p>

@@ -231,7 +229,7 @@

     in their torrc and restart Tor. OS X or Unix relays can't bind

     directly to these ports (since they don't run as root), so they will

     need to set up some sort of <a

-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ServerForFirewalledClients">

+    href="<wikifaq>#ServerForFirewalledClients">

     port forwarding</a> so connections can reach their Tor relay. If you are

     using ports 80 and 443 already but still want to help out, other useful

     ports are 22, 110, and 143.

@@ -242,7 +240,7 @@

     — such as a public webserver — make sure that connections to the

     webserver are allowed from the local host too. You need to allow these

     connections because Tor clients will detect that your Tor relay is the <a

-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ExitEavesdroppers">safest

+    href="<wikifaq>#ExitEavesdroppers">safest

     way to reach that webserver</a>, and always build a circuit that ends

     at your relay. If you don't want to allow the connections, you must

     explicitly reject them in your exit policy.

@@ -255,7 +253,7 @@

     be run as root, so it's good practice to not run it as root. Running

     as a 'tor' user avoids issues with identd and other services that

     detect user name. If you're the paranoid sort, feel free to <a

-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorInChroot">put Tor

+    href="<wiki>TheOnionRouter/TorInChroot">put Tor

     into a chroot jail</a>.)

     </p>

@@ -80,7 +80,7 @@

     </p>

     <p>If you prefer, you can instead use Privoxy with <a

-    href="https://wiki.torproject.org/noreply/TheOnionRouter/PrivoxyConfig">this

+    href="<wiki>TheOnionRouter/PrivoxyConfig">this

     sample Privoxy configuration</a>. But since the config files both use

     port 8118, you shouldn't run both Polipo and Privoxy at the same time.</p>

@@ -106,7 +106,7 @@

     <p>

     If you plan to run Firefox on a different computer than Tor, see the <a

-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#SocksListenAddress">

+    href="<wikifaq>#SocksListenAddress">

     FAQ

     entry for running Tor on a different computer</a>.

     </p>

@@ -115,15 +115,15 @@

     point them at Polipo (that is, localhost port 8118). To use SOCKS

     directly (for instant messaging, Jabber, IRC, etc), you can point

     your application directly at Tor (localhost port 9050), but see <a

-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#SOCKSAndDNS">this

+    href="<wikifaq>#SOCKSAndDNS">this

     FAQ entry</a> for why this may be dangerous. For applications

     that support neither SOCKS nor HTTP, take a look at <a

     href="http://tsocks.sourceforge.net/">tsocks</a> or <a

-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO#socat">socat</a>.

+    href="<wiki>TheOnionRouter/TorifyHOWTO#socat">socat</a>.

     </p>

     <p>For information on how to Torify other applications, check out the

-    <a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO">Torify

+    <a href="<wiki>TheOnionRouter/TorifyHOWTO">Torify

     HOWTO</a>.

     </p>

@@ -141,7 +141,7 @@

     #<a href="http://ipchicken.com/">this site</a>

     #to see what IP address it thinks you're using.

     (If that site is down, see <a

-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#IsMyConnectionPrivate">this

+    href="<wikifaq>#IsMyConnectionPrivate">this

     FAQ entry</a> for more suggestions on how to test your Tor.)

     </p>

@@ -152,7 +152,7 @@

     9050). If

     your firewall blocks outgoing connections, punch a hole so

     it can connect to at least TCP ports 80 and 443, and then see <a

-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#FirewalledClient">this

+    href="<wikifaq>#FirewalledClient">this

     FAQ entry</a>.  If your SELinux config is not allowing tor or privoxy to

     run correctly, create a file named booleans.local in the directory

     /etc/selinux/targeted.  Edit this file in your favorite text editor and

@@ -161,7 +161,7 @@

     </p>

     <p>If it's still not working, look at <a

-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork">this

+    href="<wikifaq>#ItDoesntWork">this

     FAQ entry</a> for hints.</p>

     <hr />

@@ -180,7 +180,7 @@

     <p>Having relays in many different places on the Internet is what

     makes Tor users secure. <a

-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayAnonymity">You

+    href="<wikifaq>#RelayAnonymity">You

     may also get stronger anonymity yourself</a>,

     since remote sites can't know whether connections originated at your

     computer or were relayed from others.</p>

@@ -44,7 +44,7 @@

     You should fill in "localhost"

     and "8118" to point the top four protocols to Polipo, as shown here. (Even

     though Polipo doesn't support FTP and Gopher, <a

-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#FtpProxy">you

+    href="wikifaq#FtpProxy">you

     should set them up anyway</a>.) You should also fill out the socks proxy entry to point directly to Tor ("localhost", "9050", and socks5)

     to cover protocols besides the first four. Then click "OK".</p>

@@ -86,7 +86,7 @@

     <p>

     If you plan to run Firefox on a different computer than Tor, see the <a

-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#SocksListenAddress">FAQ

+    href="<wikifaq>#SocksListenAddress">FAQ

     entry for running Tor on a different computer</a>.

     </p>

@@ -94,14 +94,14 @@

     point them at Polipo (that is, localhost port 8118). To use SOCKS

     directly (for instant messaging, Jabber, IRC, etc), you can point

     your application directly at Tor (localhost port 9050), but see <a

-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#SOCKSAndDNS">this

+    href="<wikifaq>#SOCKSAndDNS">this

     FAQ entry</a> for why this may be dangerous. For applications

     that support neither SOCKS nor HTTP, take a look at SocksCap or

     <a href="http://www.freecap.ru/eng/">FreeCap</a>.

     (FreeCap is free software; SocksCap is proprietary.)</p>

     <p>For information on how to Torify other applications, check out the

-    <a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO">Torify

+    <a href="<wiki>/TheOnionRouter/TorifyHOWTO">Torify

     HOWTO</a>.

     </p>

@@ -125,7 +125,7 @@

     sure that your IP address is being anonymized. Click on <a

     href="https://check.torproject.org/">the Tor detector</a> and see

     whether it thinks you're using Tor or not.  (If that site is down, see <a

-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#IsMyConnectionPrivate">this

+    href="<wikifaq>#IsMyConnectionPrivate">this

     FAQ entry</a> for more suggestions on how to test your Tor.)

     </p>

@@ -134,12 +134,12 @@

     your local applications to local port 8118 and port 9050. If

     your firewall blocks outgoing connections, punch a hole so

     it can connect to at least TCP ports 80 and 443, and then see <a

-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#FirewalledClient">this

+    href="<wikifaq>#FirewalledClient">this

     FAQ entry</a>.

     </p>

     <p>If it's still not working, look at <a

-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork">this

+    href="<wikifaq>#ItDoesntWork">this

     FAQ entry</a> for hints.</p>

     <p>

@@ -163,7 +163,7 @@

     <p>Having relays in many different places on the Internet is what

     makes Tor users secure. <a

-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#RelayAnonymity">You

+    href="<wikifaq>#RelayAnonymity">You

     may also get stronger anonymity yourself</a>,

     since remote sites can't know whether connections originated at your

     computer or were relayed from others.</p>

@@ -59,7 +59,7 @@

     immediately and your browser pops up an alert saying that

     "www.duskgytldkxiuqc6.onion could not be found, please check the name and

     try again" then you haven't configured Tor correctly; see <a

-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork">the

+    href="<wikifaq>#ItDoesntWork">the

     it-doesn't-work FAQ entry</a> for some help.

     </p>

@@ -118,7 +118,7 @@

     </p>

     <p>First, open your torrc file in your favorite text editor. (See <a

-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc">the

+    href="<wikifaq>#torrc">the

     torrc FAQ entry</a> to learn what this means.) Go to the middle section and

     look for the line</p>

@@ -170,7 +170,7 @@

     your logfiles for hints. It will print some warnings or error messages. That

     should give you an idea what went wrong. Typically there are typos in the torrc

     or wrong directory permissions (See <a

-    href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#Logs">the

+    href="<wikifaq>#Logs">the

     logging FAQ entry</a> if you don't know how to enable or find your

     log file.)

     </p>

@@ -65,7 +65,7 @@

           <li><a href="<page docs/tor-manual>">Manuals</a></li>

           <li><a href="<page docs/documentation>">Installation Guides</a></li>

           <li><a href="<wiki>">Tor Wiki</a></li>

-          <li><a href="<page docs/faq>">FAQ</a></li>

+          <li><a href="<wikifaq>">FAQ</a></li>

         </ul>

       </div>

       <!-- END COL -->

@@ -6,7 +6,8 @@

 <define-tag gitrepo whitespace=delete>https://gitweb.torproject.org/tor.git?a=tree;hb=HEAD</define-tag>

 <define-tag svnwebsite whitespace=delete>https://svn.torproject.org/svn/website/trunk/</define-tag>

 <define-tag svnprojects whitespace=delete>https://svn.torproject.org/svn/projects/</define-tag>

-<define-tag wiki whitespace=delete>https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/</define-tag>

+<define-tag wiki whitespace=delete>https://trac.torproject.org/projects/tor/wiki/</define-tag>

+<define-tag wikifaq whitespace=delete>https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ</define-tag>

 <define-tag blog whitespace=delete>https://blog.torproject.org/</define-tag>

 <define-tag tbbrepo whitespace=delete>https://gitweb.torproject.org/torbrowser.git/blob_plain/HEAD:</define-tag>