@@ -2,15 +2,15 @@

 # Revision: $Revision$

 # Translation-Priority: 3-low

-#include "head.wmi" TITLE="Tor: Linux/BSD/Unix Install Instructions" CHARSET="UTF-8"

+#include "head.wmi" TITLE="Tor: Linux Install Instructions" CHARSET="UTF-8"

 <div id="content" class="clearfix">

   <div id="breadcrumbs">

     <a href="<page index>">Home &raquo; </a>

     <a href="<page docs/documentation>">Documentation &raquo; </a>

-    <a href="<page docs/tor-doc-unix>">Linux/BSD/Unix Client</a>

+    <a href="<page docs/tor-doc-unix>">Linux Client</a>

   </div> 

   <div id="maincol"> 

-    <h1>Running the <a href="<page index>">Tor</a> client on Linux/BSD/Unix</h1>

+    <h1>Running the <a href="<page index>">Tor</a> client on Linux</h1>

     <br>

     <h2>Note that these are the installation instructions for running a

@@ -30,8 +30,6 @@

     Red Hat, Gentoo, etc there too. If you're

     using Ubuntu, don't use the default packages: use <a

     href="<page docs/debian>#ubuntu">our deb repository</a> instead.

-    Similarly, CentOS / Fedora users should use <a href="<page

-    docs/rpms>">our rpm repository</a> instead.

     </p>

     <p>If you're building from source, first install <a

@@ -61,7 +61,7 @@

     readily configured Tor and a browser patched for better anonymity.

     To use SOCKS directly (for instant messaging, Jabber, IRC, etc), you

     can point your application directly at Tor (localhost

-    port 9050, or port 9150 for Tor Browser), but see <a href="<page docs/faq#TBBSocksPort">this FAQ

+    port 9050, or port 9150 for Tor Browser), but see <a href="<page docs/faq>#TBBSocksPort">this FAQ

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

     that support neither SOCKS nor HTTP, take a look at <a href="https://code.google.com/p/torsocks/">torsocks</a>

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

@@ -56,9 +56,12 @@

     <br>

     <p>

-    If you want to use Tor for anonymous web browsing, please use <a href="<page projects/torbrowser>">Tor Browser</a>. It comes with readily configured Tor and a browser patched for better anonymity. 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="<page docs/faq#TBBSocksPort">this FAQ

+    If you want to use Tor for anonymous web browsing, please use <a

+    href="<page projects/torbrowser>">Tor Browser</a>. It comes with

+    readily configured Tor and a browser patched for better anonymity.

+    To use SOCKS directly (for instant messaging, Jabber, IRC, etc), you

+    can point your application directly at Tor (localhost

+    port 9050, or port 9150 for Tor Browser), but see <a href="<page docs/faq#TBBSocksPort">this FAQ

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

     that support neither SOCKS nor HTTP, take a look at <a href="https://code.google.com/p/torsocks/">torsocks</a>

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

@@ -58,7 +58,7 @@

     <p>

     If you want to use Tor for anonymous web browsing, please use <a href="<page projects/torbrowser>">Tor Browser</a>. It comes with readily configured Tor and a browser patched for better anonymity. 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="<wikifaq>#SOCKSAndDNS">this FAQ

+    port 9050), but see <a href="<page docs/faq#TBBSocksPort">this FAQ

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

     that support neither SOCKS nor HTTP, take a look at <a href="https://code.google.com/p/torsocks/">torsocks</a>

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

@@ -27,7 +27,7 @@

     <p>

     The latest release of Tor can be found on the <a

     href="<page download/download>">download</a> page. We have packages for Debian,

-    Red Hat, Gentoo, *BSD, etc there too. If you're

+    Red Hat, Gentoo, etc there too. If you're

     using Ubuntu, don't use the default packages: use <a

     href="<page docs/debian>#ubuntu">our deb repository</a> instead.

     Similarly, CentOS / Fedora users should use <a href="<page

@@ -91,23 +91,9 @@

     <h2><a class="anchor" href="#relay">Step Three: Configure it as a relay</a></h2>

     <br>

-    <p>The Tor network relies on volunteers to donate bandwidth. The more

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

-    at least 50 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 rate limiting for bandwidth, exit policies so

-    you can limit your exposure to abuse complaints, and support for dynamic

-    IP addresses.</p>

-    

-    <p>Having relays in many different places on

-    the Internet is what makes Tor users secure. <a

-    href="<wikifaq>#DoIgetbetteranonymityifIrunarelay">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>

-

-    <p>Read more at our <a href="<page docs/tor-doc-relay>">Configuring a relay</a>

-    guide.</p>

+    <p>The Tor network relies on volunteers to donate bandwidth. If you

+    want to help <strong>make the Tor network faster</strong>, please

+    consider <a href="<page docs/tor-doc-relay>">running a relay</a>.</p>

     <hr>

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

     <br>

     <h2>Note that these are the installation instructions for running a

-    Tor client. The easiest way to do this is to simply download the <a

-    href="<page projects/torbrowser>">Tor Browser Bundle</a> and you are

+    Tor client. The easiest way to do this is to simply download <a

+    href="<page projects/torbrowser>">Tor Browser</a> and you are

     done.

     </h2>

@@ -56,7 +56,7 @@

     <br>

     <p>

-    If you want to use Tor for anonymous web browsing, please use the <a href="<page projects/torbrowser>">Tor Browser Bundle</a>. It comes with readily configured Tor and a browser patched for better anonymity. To use SOCKS directly (for instant messaging, Jabber, IRC, etc),

+    If you want to use Tor for anonymous web browsing, please use <a href="<page projects/torbrowser>">Tor Browser</a>. It comes with readily configured Tor and a browser patched for better anonymity. 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="<wikifaq>#SOCKSAndDNS">this FAQ

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

@@ -30,7 +30,7 @@

     Red Hat, Gentoo, *BSD, etc there too. If you're

     using Ubuntu, don't use the default packages: use <a

     href="<page docs/debian>#ubuntu">our deb repository</a> instead.

-    Similarly, CentOS / Fedora / OpenSUSE users should use <a href="<page

+    Similarly, CentOS / Fedora users should use <a href="<page

     docs/rpms>">our rpm repository</a> instead.

     </p>

@@ -93,7 +93,7 @@

     <p>The Tor network relies on volunteers to donate bandwidth. The more

     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

+    at least 50 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 rate limiting for bandwidth, exit policies so

     you can limit your exposure to abuse complaints, and support for dynamic

@@ -55,62 +55,26 @@

     <h2><a class="anchor" href="#using">Step Two: Configure your applications to use Tor</a></h2>

     <br>

-    <p>After installing Tor, you need to configure your applications to

-    use them. The first step is to set up web browsing.</p>

-    

-    <p>You should use Tor with Firefox and Torbutton, for best safety.

-    Simply install the <a

-    href="<page torbutton/index>">Torbutton

-    plugin</a>, restart your Firefox, and you're all set:

-    </p>

-    

-    <img alt="Torbutton plugin for Firefox"

-    src="$(IMGROOT)/screenshot-torbutton.png"

-   >

-    

-    <br>

-    

     <p>

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

-    href="<wikifaq>#SocksListenAddress">

-    FAQ

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

-    </p>

-    

-    <p>To Torify other applications that support SOCKS proxies, just

-    point them at Tor's SOCKS port (127.0.0.1 port 9050). See <a

-    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="https://code.google.com/p/torsocks/">torsocks</a>

-    or <a href="<wiki>doc/TorifyHOWTO#socat">socat</a>.

+    If you want to use Tor for anonymous web browsing, please use the <a href="<page projects/torbrowser>">Tor Browser Bundle</a>. It comes with readily configured Tor and a browser patched for better anonymity. 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="<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="https://code.google.com/p/torsocks/">torsocks</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="<wiki>doc/TorifyHOWTO">Torify HOWTO</a>.

     </p>

-    <hr>

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

-    <h2><a class="anchor" href="#verify">Step Three: Make sure it's working</a></h2>

-    <br>

-    

-    <p>

-    Next, you should try using your browser with Tor and make

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

-    suggestions on how to test your Tor.)

-    </p>

-    

     <p>If you have a personal firewall that limits your computer's ability

     to connect to itself (this includes something like SELinux on Fedora

     Core 4), be sure to allow connections from your local applications to

     Tor (local 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="<wikifaq>#FirewalledClient">this FAQ entry</a>.

-    If your SELinux config is not allowing tor or privoxy to run

+    If your SELinux config is not allowing tor to run

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

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

     and insert "allow_ypbind=1".  Restart your machine for this change

@@ -124,7 +88,7 @@

     <hr>

     <a id="server"></a>

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

-    <h2><a class="anchor" href="#relay">Step Four: Configure it as a relay</a></h2>

+    <h2><a class="anchor" href="#relay">Step Three: Configure it as a relay</a></h2>

     <br>

     <p>The Tor network relies on volunteers to donate bandwidth. The more

@@ -135,10 +135,11 @@

     you can limit your exposure to abuse complaints, and support for dynamic

     IP addresses.</p>

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

-    makes Tor users secure. <a 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

+    <p>Having relays in many different places on

+    the Internet is what makes Tor users secure. <a

+    href="<wikifaq>#DoIgetbetteranonymityifIrunarelay">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>

     <p>Read more at our <a href="<page docs/tor-doc-relay>">Configuring a relay</a>

@@ -13,12 +13,11 @@

     <h1>Running the <a href="<page index>">Tor</a> client on Linux/BSD/Unix</h1>

     <br>

-    <p>

-    <b>Note that these are the installation instructions for running a

+    <h2>Note that these are the installation instructions for running a

     Tor client. The easiest way to do this is to simply download the <a

     href="<page projects/torbrowser>">Tor Browser Bundle</a> and you are

-    done. </b>

-    </p>

+    done.

+    </h2>

     <hr>

     <a id="installing"></a>

@@ -99,9 +99,8 @@

     Next, you should try using your browser with Tor and make

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

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

+    (If that site is down, see <a

     href="<wikifaq>#IsMyConnectionPrivate">this FAQ entry</a> for more

     suggestions on how to test your Tor.)

     </p>

@@ -16,7 +16,7 @@

     <p>

     <b>Note that these are the installation instructions for running a

     Tor client. The easiest way to do this is to simply download the <a

-    href="<page projects/torbrowser>"Tor Browser Bundle</a> and you are

+    href="<page projects/torbrowser>">Tor Browser Bundle</a> and you are

     done. </b>

     </p>

@@ -14,10 +14,10 @@

     <br>

     <p>

-    <b>Note that these are the installation instructions for running a Tor

-    client. If you want to relay traffic for others to help the network grow

-    (please do), read the <a

-    href="<page docs/tor-doc-relay>">Configuring a relay</a> guide.</b>

+    <b>Note that these are the installation instructions for running a

+    Tor client. The easiest way to do this is to simply download the <a

+    href="<page projects/torbrowser>"Tor Browser Bundle</a> and you are

+    done. </b>

     </p>

     <hr>

@@ -78,20 +78,16 @@

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

     </p>

-    <p>To Torify other applications that support HTTP proxies, just

-    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="<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="https://code.google.com/p/torsocks/">torsocks</a> or <a

-    href="<wiki>doc/TorifyHOWTO#socat">socat</a>.

+    <p>To Torify other applications that support SOCKS proxies, just

+    point them at Tor's SOCKS port (127.0.0.1 port 9050). See <a

+    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="https://code.google.com/p/torsocks/">torsocks</a>

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

     </p>

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

-    <a href="<wiki>doc/TorifyHOWTO">Torify

-    HOWTO</a>.

+    <a href="<wiki>doc/TorifyHOWTO">Torify HOWTO</a>.

     </p>

     <hr>

@@ -101,30 +97,26 @@

     <p>

     Next, you should try using your browser with Tor and make

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

-    #<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="<wikifaq>#IsMyConnectionPrivate">this

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

+    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.  #<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="<wikifaq>#IsMyConnectionPrivate">this FAQ entry</a> for more

+    suggestions on how to test your Tor.)

     </p>

-    <p>If you have a personal firewall that limits your computer's

-    ability to connect to itself (this includes something like SELinux on

-    Fedora Core 4), be sure to allow connections from

-    your local applications to Polipo (local port 8118) and Tor (local 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="<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

-    insert "allow_ypbind=1".  Restart your machine for this change to take

-    effect.

+    <p>If you have a personal firewall that limits your computer's ability

+    to connect to itself (this includes something like SELinux on Fedora

+    Core 4), be sure to allow connections from your local applications to

+    Tor (local 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="<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 insert "allow_ypbind=1".  Restart your machine for this change

+    to take effect.

     </p>

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

@@ -139,19 +131,18 @@

     <p>The Tor network relies on volunteers to donate bandwidth. The more

     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

+    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 rate limiting for bandwidth, exit policies so

     you can limit your exposure to abuse complaints, and support for dynamic

     IP addresses.</p>

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

-    makes Tor users secure. <a

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

-    

+    makes Tor users secure. <a 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>

+

     <p>Read more at our <a href="<page docs/tor-doc-relay>">Configuring a relay</a>

     guide.</p>

@@ -51,48 +51,13 @@

     the settings. Tor is now installed.

     </p>

-    <hr>

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

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

-    <h2><a class="anchor" href="#polipo">Step Two: Install Polipo for Web Browsing</a></h2>

-    <br>

-    

-    <p>After installing Tor, you need to configure your applications to use it.

-    </p>

-    

-    <p>

-    The first step is to set up web browsing. Start by installing <a

-    href="http://www.pps.jussieu.fr/~jch/software/polipo/">Polipo</a> from

-    your favorite repository. Polipo is a caching web proxy that does http

-    pipelining well, so it's well-suited for Tor's latencies. Make sure

-    to get at least Polipo 1.0.4, since earlier versions lack the SOCKS support

-    required to use Polipo with Tor. You should uninstall privoxy at this

-    point (e.g. apt-get remove privoxy or yum remove privoxy), so they don't

-    conflict.

-    </p>

-    

-    <p>Once you've installed Polipo (either from package or from

-    source), <b>you will need to configure Polipo to use Tor</b>. Grab our <a

-    href="<tbbrepo>/build-scripts/config/polipo.conf">Polipo

-    configuration for Tor</a> and put it in place of your current polipo

-    config file (e.g. /etc/polipo/config or ~/.polipo).

-    You'll need to restart Polipo for the changes to take effect. For

-    example:<br>

-    <tt>/etc/init.d/polipo restart</tt>

-    </p>

-    

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

-    href="<wiki>doc/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>

-    

     <hr>

     <a id="using"></a>

-    <h2><a class="anchor" href="#using">Step Three: Configure your applications to use Tor</a></h2>

+    <h2><a class="anchor" href="#using">Step Two: Configure your applications to use Tor</a></h2>

     <br>

-    <p>After installing Tor and Polipo, you need to configure your

-    applications to use them. The first step is to set up web browsing.</p>

+    <p>After installing Tor, you need to configure your applications to

+    use them. The first step is to set up web browsing.</p>

     <p>You should use Tor with Firefox and Torbutton, for best safety.

     Simply install the <a

@@ -131,7 +96,7 @@

     <hr>

     <a id="verify"></a>

-    <h2><a class="anchor" href="#verify">Step Four: Make sure it's working</a></h2>

+    <h2><a class="anchor" href="#verify">Step Three: Make sure it's working</a></h2>

     <br>

     <p>

@@ -169,7 +134,7 @@

     <hr>

     <a id="server"></a>

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

-    <h2><a class="anchor" href="#relay">Step Five: Configure it as a relay</a></h2>

+    <h2><a class="anchor" href="#relay">Step Four: Configure it as a relay</a></h2>

     <br>

     <p>The Tor network relies on volunteers to donate bandwidth. The more

@@ -82,7 +82,7 @@

     </p>

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

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

+    href="<wiki>doc/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>

@@ -121,11 +121,11 @@

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

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

     href="https://code.google.com/p/torsocks/">torsocks</a> or <a

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

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

     </p>

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

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

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

     HOWTO</a>.

     </p>

@@ -96,7 +96,7 @@

     <p>You should use Tor with Firefox and Torbutton, for best safety.

     Simply install the <a

-    href="https://www.torproject.org/torbutton/">Torbutton

+    href="<page torbutton/index>">Torbutton

     plugin</a>, restart your Firefox, and you're all set:

     </p>

@@ -96,7 +96,7 @@

     <p>You should use Tor with Firefox and Torbutton, for best safety.

     Simply install the <a

-    href="https://addons.mozilla.org/firefox/2275/">Torbutton

+    href="https://www.torproject.org/torbutton/">Torbutton

     plugin</a>, restart your Firefox, and you're all set:

     </p>

@@ -31,6 +31,8 @@

     Red Hat, Gentoo, *BSD, etc there too. If you're

     using Ubuntu, don't use the default packages: use <a

     href="<page docs/debian>#ubuntu">our deb repository</a> instead.

+    Similarly, CentOS / Fedora / OpenSUSE users should use <a href="<page

+    docs/rpms>">our rpm repository</a> instead.

     </p>

     <p>If you're building from source, first install <a

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

     </p>

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

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

+    href="<page docs/faq>#DoesntWork">this

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

     <hr>

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

     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://code.google.com/p/torsocks/">torsocks</a> or <a

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

     </p>

@@ -1,5 +1,5 @@

 ## translation metadata

-# Revision: $Revision: 21798 $

+# Revision: $Revision$

 # Translation-Priority: 3-low

 #include "head.wmi" TITLE="Tor: Linux/BSD/Unix Install Instructions" CHARSET="UTF-8"

@@ -71,7 +71,7 @@

     <p>Once you've installed Polipo (either from package or from

     source), <b>you will need to configure Polipo to use Tor</b>. Grab our <a

-    href="https://gitweb.torproject.org/torbrowser.git/blob_plain/HEAD:/build-scripts/config/polipo.conf">Polipo

+    href="<tbbrepo>/build-scripts/config/polipo.conf">Polipo

     configuration for Tor</a> and put it in place of your current polipo

     config file (e.g. /etc/polipo/config or ~/.polipo).

     You'll need to restart Polipo for the changes to take effect. For

@@ -71,7 +71,7 @@

     <p>Once you've installed Polipo (either from package or from

     source), <b>you will need to configure Polipo to use Tor</b>. Grab our <a

-    href="https://svn.torproject.org/svn/torbrowser/trunk/build-scripts/config/polipo.conf">Polipo

+    href="https://gitweb.torproject.org/torbrowser.git/blob_plain/HEAD:/build-scripts/config/polipo.conf">Polipo

     configuration for Tor</a> and put it in place of your current polipo

     config file (e.g. /etc/polipo/config or ~/.polipo).

     You'll need to restart Polipo for the changes to take effect. For

@@ -100,7 +100,7 @@

     <img alt="Torbutton plugin for Firefox"

     src="$(IMGROOT)/screenshot-torbutton.png"

-    border="1">

+   >

     <br>

@@ -11,7 +11,7 @@

   </div> 

   <div id="maincol"> 

     <h1>Running the <a href="<page index>">Tor</a> client on Linux/BSD/Unix</h1>

-    <br />

+    <br>

     <p>

     <b>Note that these are the installation instructions for running a Tor

@@ -20,10 +20,10 @@

     href="<page docs/tor-doc-relay>">Configuring a relay</a> guide.</b>

     </p>

-    <hr />

+    <hr>

     <a id="installing"></a>

     <h2><a class="anchor" href="#installing">Step One: Download and Install Tor</a></h2>

-    <br />

+    <br>

     <p>

     The latest release of Tor can be found on the <a

@@ -36,9 +36,9 @@

     <p>If you're building from source, first install <a

     href="http://www.monkey.org/~provos/libevent/">libevent</a>, and

     make sure you have openssl and zlib (including the -devel packages if

-    applicable). Then run:<br />

-    <tt>tar xzf tor-<version-stable>.tar.gz; cd tor-<version-stable></tt><br />

-    <tt>./configure &amp;&amp; make</tt><br />

+    applicable). Then run:<br>

+    <tt>tar xzf tor-<version-stable>.tar.gz; cd tor-<version-stable></tt><br>

+    <tt>./configure &amp;&amp; make</tt><br>

     Now you can run tor as <tt>src/or/tor</tt>, or you can run <tt>make install</tt>

     (as root if necessary) to install it into /usr/local/, and then you can

     start it just by running <tt>tor</tt>.

@@ -49,11 +49,11 @@

     the settings. Tor is now installed.

     </p>

-    <hr />

+    <hr>

     <a id="privoxy"></a>

     <a id="polipo"></a>

     <h2><a class="anchor" href="#polipo">Step Two: Install Polipo for Web Browsing</a></h2>

-    <br />

+    <br>

     <p>After installing Tor, you need to configure your applications to use it.

     </p>

@@ -75,7 +75,7 @@

     configuration for Tor</a> and put it in place of your current polipo

     config file (e.g. /etc/polipo/config or ~/.polipo).

     You'll need to restart Polipo for the changes to take effect. For

-    example:<br />

+    example:<br>

     <tt>/etc/init.d/polipo restart</tt>

     </p>

@@ -84,10 +84,10 @@

     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>

-    <hr />

+    <hr>

     <a id="using"></a>

     <h2><a class="anchor" href="#using">Step Three: Configure your applications to use Tor</a></h2>

-    <br />

+    <br>

     <p>After installing Tor and Polipo, you need to configure your

     applications to use them. The first step is to set up web browsing.</p>

@@ -102,7 +102,7 @@

     src="$(IMGROOT)/screenshot-torbutton.png"

     border="1">

-    <br />

+    <br>

     <p>

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

@@ -127,10 +127,10 @@

     HOWTO</a>.

     </p>

-    <hr />

+    <hr>

     <a id="verify"></a>

     <h2><a class="anchor" href="#verify">Step Four: Make sure it's working</a></h2>

-    <br />

+    <br>

     <p>

     Next, you should try using your browser with Tor and make

@@ -164,11 +164,11 @@

     href="<wikifaq>#ItDoesntWork">this

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

-    <hr />

+    <hr>

     <a id="server"></a>

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

     <h2><a class="anchor" href="#relay">Step Five: Configure it as a relay</a></h2>

-    <br />

+    <br>

     <p>The Tor network relies on volunteers to donate bandwidth. The more

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

@@ -188,7 +188,7 @@

     <p>Read more at our <a href="<page docs/tor-doc-relay>">Configuring a relay</a>

     guide.</p>

-    <hr />

+    <hr>

     <p>If you have suggestions for improving this document, please <a

     href="<page about/contact>">send them to us</a>. Thanks!</p>

@@ -99,7 +99,7 @@

     </p>

     <img alt="Torbutton plugin for Firefox"

-    src="../img/screenshot-torbutton.png"

+    src="$(IMGROOT)/screenshot-torbutton.png"

     border="1">

     <br />

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

@@ -5,12 +5,12 @@

 #include "head.wmi" TITLE="Tor: Linux/BSD/Unix Install Instructions" CHARSET="UTF-8"

 <div id="content" class="clearfix">

   <div id="breadcrumbs">

-    <a href="<page home>">Home &raquo; </a>

+    <a href="<page index>">Home &raquo; </a>

     <a href="<page docs/documentation>">Documentation &raquo; </a>

     <a href="<page docs/tor-doc-unix>">Linux/BSD/Unix Client</a>

   </div> 

   <div id="maincol"> 

-    <h1>Running the <a href="<page home>">Tor</a> client on Linux/BSD/Unix</h1>

+    <h1>Running the <a href="<page index>">Tor</a> client on Linux/BSD/Unix</h1>

     <br />

     <p>

new file mode 100644

@@ -0,0 +1,204 @@

+## translation metadata

+# Revision: $Revision: 21798 $

+# Translation-Priority: 3-low

+

+#include "head.wmi" TITLE="Tor: Linux/BSD/Unix Install Instructions" CHARSET="UTF-8"

+<div id="content" class="clearfix">

+  <div id="breadcrumbs">

+    <a href="<page home>">Home &raquo; </a>

+    <a href="<page docs/documentation>">Documentation &raquo; </a>

+    <a href="<page docs/tor-doc-unix>">Linux/BSD/Unix Client</a>

+  </div> 

+  <div id="maincol"> 

+    <h1>Running the <a href="<page home>">Tor</a> client on Linux/BSD/Unix</h1>

+    <br />

+    

+    <p>

+    <b>Note that these are the installation instructions for running a Tor

+    client. If you want to relay traffic for others to help the network grow

+    (please do), read the <a

+    href="<page docs/tor-doc-relay>">Configuring a relay</a> guide.</b>

+    </p>

+    

+    <hr />

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

+    <h2><a class="anchor" href="#installing">Step One: Download and Install Tor</a></h2>

+    <br />

+    

+    <p>

+    The latest release of Tor can be found on the <a

+    href="<page download/download>">download</a> page. We have packages for Debian,

+    Red Hat, Gentoo, *BSD, etc there too. If you're

+    using Ubuntu, don't use the default packages: use <a

+    href="<page docs/debian>#ubuntu">our deb repository</a> instead.

+    </p>

+    

+    <p>If you're building from source, first install <a

+    href="http://www.monkey.org/~provos/libevent/">libevent</a>, and

+    make sure you have openssl and zlib (including the -devel packages if

+    applicable). Then run:<br />

+    <tt>tar xzf tor-<version-stable>.tar.gz; cd tor-<version-stable></tt><br />

+    <tt>./configure &amp;&amp; make</tt><br />

+    Now you can run tor as <tt>src/or/tor</tt>, or you can run <tt>make install</tt>

+    (as root if necessary) to install it into /usr/local/, and then you can

+    start it just by running <tt>tor</tt>.

+    </p>

+