@@ -116,7 +116,7 @@ under the <a href="<gitblob>LICENSE">3-clause BSD license</a>.

 <p>

 There is no fee for installing Tor, or using the Tor network, but

 if you want Tor to become faster and more usable please consider

-<a href="<page donate/donate>">making a tax-deductible donation to The Tor Project</a>.

+<a href="<page donate/donate-download>">making a tax-deductible donation to The Tor Project</a>.

 </p>

 </div>

@@ -39,7 +39,7 @@

 <tr class="beige">

 <td align="center"><img src="$(IMGROOT)/distros/centos.png" alt="CentOS"> <img src="$(IMGROOT)/distros/fedora.png" alt="Fedora"></td>

 <td>CentOS and Fedora</td>

-<td colspan="2"><a href="<page docs/rpms>">repository packages</a> </td>

+<td colspan="2">yum install tor / dnf install tor</td>

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

 </tr>

@@ -55,7 +55,7 @@

 <tr class="beige">

 <td align="center"><img src="$(IMGROOT)/distros/freebsd.png" alt="FreeBSD"></td>

 <td>FreeBSD</td>

-<td colspan="2"><kbd>portinstall -s security/tor</kbd></td>

+<td colspan="2"><kbd>pkg install tor</kbd></td>

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

 </tr>

@@ -111,7 +111,7 @@ serious reliability and security bugs in these downloads.  Please be prepared to

 <div class="nb">

 <p>

 Tor is distributed as <a href="http://www.fsf.org/">Free Software</a>

-under the <a href="<gitblob>LICENSE">3-clause BSD license</a>. 

+under the <a href="<gitblob>LICENSE">3-clause BSD license</a>.

 </p>

 <p>

 There is no fee for installing Tor, or using the Tor network, but

@@ -111,10 +111,7 @@ serious reliability and security bugs in these downloads.  Please be prepared to

 <div class="nb">

 <p>

 Tor is distributed as <a href="http://www.fsf.org/">Free Software</a>

-under the <a href="<gitblob>LICENSE">3-clause BSD license</a>. The

-bundles also include <a href="<page projects/vidalia>">Vidalia</a>

-and <a href="http://www.pps.jussieu.fr/~jch/software/polipo/">Polipo</a>, which are supporting

-applications distributed under the GNU GPL.

+under the <a href="<gitblob>LICENSE">3-clause BSD license</a>. 

 </p>

 <p>

 There is no fee for installing Tor, or using the Tor network, but

@@ -151,7 +151,7 @@ href="<page getinvolved/mirrors>">list of sites mirroring the Tor site</a>.

 <a id="Testing"></a>

 <p>

 For a list of what has changed in each stable Tor release, see the

-<a href="<gitblobstable>ReleaseNotes">ReleaseNotes</a>. For a list of

+<a href="<gitblob>ReleaseNotes<cgitstable>">ReleaseNotes</a>. For a list of

 changes in both stable and development versions, see the

 <a href="<gitblob>ChangeLog">ChangeLog</a>.

 </p>

@@ -37,8 +37,8 @@

 </tr>

 <tr class="beige">

-<td align="center"><img src="$(IMGROOT)/distros/centos.png" alt="CentOS"> <img src="$(IMGROOT)/distros/fedora.png" alt="Fedora"> <img src="$(IMGROOT)/distros/suse.png" alt="openSUSE 11"></td>

-<td>CentOS, Fedora, OpenSUSE</td>

+<td align="center"><img src="$(IMGROOT)/distros/centos.png" alt="CentOS"> <img src="$(IMGROOT)/distros/fedora.png" alt="Fedora"></td>

+<td>CentOS and Fedora</td>

 <td colspan="2"><a href="<page docs/rpms>">repository packages</a> </td>

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

 </tr>

@@ -12,8 +12,11 @@

         <!-- BEGIN TEASER WARNING -->

       	<div class="warning">

           <h2>Want Tor to really work?</h2>

-<p>...then please don't just install it and go on.  You need to change some of your habits, and reconfigure your software! Tor by itself is <em>NOT</em> all you need to maintain your anonymity. Read the <a href="#warning">full list of warnings</a>.

-</p>

+            <p>...then please don't just install it and go on.

+            You need to change some of your habits, and reconfigure

+            your software! Tor by itself is <em>NOT</em> all you need

+            to maintain your anonymity. Read the <a href="<page download/download>#warning">full

+            list of warnings</a>.</p>

         </div>

         <!-- END TEASER WARNING -->

         <table class="topforty">

@@ -2,7 +2,7 @@

 # Revision: $Revision$

 # Translation-Priority: 3-low

-#include "head.wmi" TITLE="Tor: Download for Linux/Unix" CHARSET="UTF-8" ANNOUNCE_RSS="yes"

+#include "head.wmi" TITLE="Tor: Download for Linux/Unix" CHARSET="UTF-8"

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

 			<div id="breadcrumbs"><a href="<page index>">Home &raquo; </a><a href="<page download/download-unix>">Download</a></div>

@@ -62,7 +62,7 @@

 <td colspan="2"><kbd>cd /usr/ports/net/tor &amp;&amp; make &amp;&amp; make install</kbd></td>

 <td>

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

-<a href="<wiki>/TheOnionRouter/OpenbsdChrootedTor">Guide to chrooting Tor in OpenBSD</a>

+<a href="<wiki>doc/OpenbsdChrootedTor">Guide to chrooting Tor in OpenBSD</a>

 </td>

 </tr>

@@ -133,7 +133,7 @@ the list's RSS feed</a>.

 <p>

 If you would like to research any past release of Tor source, packages,

-or other binaries, see <a href="http://archive.torproject.org/">the

+or other binaries, see <a href="https://archive.torproject.org/">the

 archive</a>.

 </p>

@@ -124,19 +124,11 @@ if you want Tor to become faster and more usable please consider

 <div class="nb">

 <p>

 To keep informed of security advisories and new stable releases, subscribe

-to the <a href="http://archives.seul.org/or/announce/">or-announce

+to the <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-announce">tor-announce

 mailing list</a> (you will be asked to confirm via email). You can also

 <a href="http://rss.gmane.org/gmane.network.onion-routing.announce">watch

 the list's RSS feed</a>.

 </p>

-

-<form action="http://freehaven.net/cgi-bin/majordomo.cgi">

-<input type="hidden" name="mlist" value="or-announce"/>

-<input type="hidden" name="subscribe" value="1"/>

-<input type="hidden" name="host" value="freehaven.net"/>

-<input name="email" size="15"/>

-<input type="submit" value="subscribe to or-announce"/>

-</form>

 </div>

 <p>

@@ -73,7 +73,7 @@

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

 </tr>

-<tr class="beige">

+<tr>

 <td align="center"><img src="$(IMGROOT)/distros/terminal.png" alt="Source code"></td>

 <td>Source tarballs</td>

 <td>

@@ -78,11 +78,11 @@

 <td>Source tarballs</td>

 <td>

 <a href="<package-source-stable>"><version-stable></a>

- (<a href="<package-source-stable-sig>">sig</a>)

+ (<a href="<package-source-stable>.asc">sig</a>)

 </td>

 <td>

 <a href="<package-source-alpha>"><version-alpha></a>

- (<a href="<package-source-alpha-sig>">sig</a>)

+ (<a href="<package-source-alpha>.asc">sig</a>)

 </td>

 <td><kbd>./configure &amp;&amp; make &amp;&amp; src/or/tor</kbd></td>

 </tr>

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

 ## translation metadata

-# Revision: $Revision: 22543 $

+# Revision: $Revision$

 # Translation-Priority: 3-low

 #include "head.wmi" TITLE="Tor: Download for Linux/Unix" CHARSET="UTF-8" ANNOUNCE_RSS="yes"

@@ -167,7 +167,7 @@ changes in both stable and development versions, see the

         <div class="img-shadow">

           <div class="infoblock">

           	<h2>Verify Signatures</h2>

-            <p>Verify your downloads with our PGP signatures:</p>

+            <p>Verify your downloads with our GPG signatures:</p>

             <a href="<page docs/verifying-signatures>">Read how to

 verify the signatures</a>.

           </div>

@@ -177,7 +177,7 @@ verify the signatures</a>.

         	<div class="sidenav-sub">

           	<h2>Having Trouble?</h2>

           	<ul>

-            	<li class="dropdown"><a href="#">What are the differences between stable and unstable downloads?</a></li>

+            	<li class="dropdown"><a href="#packagediff">What are the differences between stable and unstable downloads?</a></li>

             </ul>

           </div>

       	</div>

@@ -178,11 +178,6 @@ verify the signatures</a>.

           	<h2>Having Trouble?</h2>

           	<ul>

             	<li class="dropdown"><a href="#">What are the differences between stable and unstable downloads?</a></li>

-            	<li class="dropdown"><a href="#">Why is the TorBrowser Bundle only available for Windows?</a></li>

-            	<li class="dropdown"><a href="#">What is the Expert Developer Package?</a></li>

-            	<li class="dropdown"><a href="#">What are the differences between stable and unstable downloads?</a></li>

-            	<li class="dropdown"><a href="#">Why is the TorBrowser Bundle only available for Windows?</a></li>

-            	<li class="dropdown"><a href="#">What is the Expert Developer Package?</a></li>

             </ul>

           </div>

       	</div>

@@ -27,21 +27,21 @@

 </thead>

 <tr>

-<td align="center"><img src="images/distros/debian.png" alt="Debian"> <img src="images/distros/ubuntu.png" alt="Ubuntu"> <img src="images/distros/knoppix.png" alt="Knoppix"></td>

+<td align="center"><img src="$(IMGROOT)/distros/debian.png" alt="Debian"> <img src="$(IMGROOT)/distros/ubuntu.png" alt="Ubuntu"> <img src="$(IMGROOT)/distros/knoppix.png" alt="Knoppix"></td>

 <td>Debian, Ubuntu, Knoppix</td>

 <td colspan="2"><a href="<page docs/debian>">repository packages</a> </td>

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

 </tr>

 <tr class="beige">

-<td align="center"><img src="images/distros/centos.png" alt="CentOS"> <img src="images/distros/fedora.png" alt="Fedora"> <img src="images/distros/suse.png" alt="openSUSE 11"></td>

+<td align="center"><img src="$(IMGROOT)/distros/centos.png" alt="CentOS"> <img src="$(IMGROOT)/distros/fedora.png" alt="Fedora"> <img src="$(IMGROOT)/distros/suse.png" alt="openSUSE 11"></td>

 <td>CentOS, Fedora, OpenSUSE</td>

 <td colspan="2"><a href="<page docs/rpms>">repository packages</a> </td>

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

 </tr>

 <tr>

-<td align="center"><img src="images/distros/gentoo.png" alt="Gentoo Linux"></td>

+<td align="center"><img src="$(IMGROOT)/distros/gentoo.png" alt="Gentoo Linux"></td>

 <td>Gentoo Linux</td>

 <td colspan="2"><kbd>emerge tor</kbd></td>

 <td>

@@ -50,14 +50,14 @@

 </tr>

 <tr class="beige">

-<td align="center"><img src="images/distros/freebsd.png" alt="FreeBSD"></td>

+<td align="center"><img src="$(IMGROOT)/distros/freebsd.png" alt="FreeBSD"></td>

 <td>FreeBSD</td>

 <td colspan="2"><kbd>portinstall -s security/tor</kbd></td>

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

 </tr>

 <tr>

-<td align="center"><img src="images/distros/openbsd.png" alt="OpenBSD"></td>

+<td align="center"><img src="$(IMGROOT)/distros/openbsd.png" alt="OpenBSD"></td>

 <td>OpenBSD</td>

 <td colspan="2"><kbd>cd /usr/ports/net/tor &amp;&amp; make &amp;&amp; make install</kbd></td>

 <td>

@@ -67,14 +67,14 @@

 </tr>

 <tr class="beige">

-<td align="center"><img src="images/distros/netbsd.png" alt="NetBSD"></td>

+<td align="center"><img src="$(IMGROOT)/distros/netbsd.png" alt="NetBSD"></td>

 <td>NetBSD</td>

 <td colspan="2"><kbd>cd /usr/pkgsrc/net/tor &amp;&amp; make install</kbd></td>

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

 </tr>

 <tr class="beige">

-<td align="center"><img src="images/distros/terminal.png" alt="Source code"></td>

+<td align="center"><img src="$(IMGROOT)/distros/terminal.png" alt="Source code"></td>

 <td>Source tarballs</td>

 <td>

 <a href="<package-source-stable>"><version-stable></a>

@@ -27,54 +27,54 @@

 </thead>

 <tr>

-<td align="center"><img src="images/distros/debian.png" alt="Debian" /> <img src="images/distros/ubuntu.png" alt="Ubuntu" /> <img src="images/distros/knoppix.png" alt="Knoppix" /></td>

+<td align="center"><img src="images/distros/debian.png" alt="Debian"> <img src="images/distros/ubuntu.png" alt="Ubuntu"> <img src="images/distros/knoppix.png" alt="Knoppix"></td>

 <td>Debian, Ubuntu, Knoppix</td>

 <td colspan="2"><a href="<page docs/debian>">repository packages</a> </td>

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

 </tr>

 <tr class="beige">

-<td align="center"><img src="images/distros/centos.png" alt="CentOS" /> <img src="images/distros/fedora.png" alt="Fedora" /> <img src="images/distros/suse.png" alt="openSUSE 11" /></td>

+<td align="center"><img src="images/distros/centos.png" alt="CentOS"> <img src="images/distros/fedora.png" alt="Fedora"> <img src="images/distros/suse.png" alt="openSUSE 11"></td>

 <td>CentOS, Fedora, OpenSUSE</td>

 <td colspan="2"><a href="<page docs/rpms>">repository packages</a> </td>

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

 </tr>

 <tr>

-<td align="center"><img src="images/distros/gentoo.png" alt="Gentoo Linux" /></td>

+<td align="center"><img src="images/distros/gentoo.png" alt="Gentoo Linux"></td>

 <td>Gentoo Linux</td>

 <td colspan="2"><kbd>emerge tor</kbd></td>

 <td>

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

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

 </td>

 </tr>

 <tr class="beige">

-<td align="center"><img src="images/distros/freebsd.png" alt="FreeBSD" /></td>

+<td align="center"><img src="images/distros/freebsd.png" alt="FreeBSD"></td>

 <td>FreeBSD</td>

 <td colspan="2"><kbd>portinstall -s security/tor</kbd></td>

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

 </tr>

 <tr>

-<td align="center"><img src="images/distros/openbsd.png" alt="OpenBSD" /></td>

+<td align="center"><img src="images/distros/openbsd.png" alt="OpenBSD"></td>

 <td>OpenBSD</td>

 <td colspan="2"><kbd>cd /usr/ports/net/tor &amp;&amp; make &amp;&amp; make install</kbd></td>

 <td>

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

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

 <a href="<wiki>/TheOnionRouter/OpenbsdChrootedTor">Guide to chrooting Tor in OpenBSD</a>

 </td>

 </tr>

 <tr class="beige">

-<td align="center"><img src="images/distros/netbsd.png" alt="NetBSD" /></td>

+<td align="center"><img src="images/distros/netbsd.png" alt="NetBSD"></td>

 <td>NetBSD</td>

 <td colspan="2"><kbd>cd /usr/pkgsrc/net/tor &amp;&amp; make install</kbd></td>

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

 </tr>

 <tr class="beige">

-<td align="center"><img src="images/distros/terminal.png" alt="Source code" /></td>

+<td align="center"><img src="images/distros/terminal.png" alt="Source code"></td>

 <td>Source tarballs</td>

 <td>

 <a href="<package-source-stable>"><version-stable></a>

@@ -4,27 +4,27 @@

 #include "head.wmi" TITLE="Tor: Download for Linux/Unix" CHARSET="UTF-8" ANNOUNCE_RSS="yes"

-<div class="main-column">

-

-<h2>Available Linux/Unix Packages</h2>

-<div class="warning">

-

-Warning: Want Tor to really work?  ...then please don't just install it

-and go on. You need to change some of your habits, and reconfigure your

-software! Tor by itself is NOT all you need to maintain your anonymity.

-Please take time to read the <a href="#Warning">warning</a> to familiarize yourself with the pitfalls and limits of Tor.

-</div>

-

-<div class="underline"></div>

-

-<table cellpadding="6" cellspacing="1" border="0" width="100%">

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

+			<div id="breadcrumbs"><a href="<page index>">Home &raquo; </a><a href="<page download/download-unix>">Download</a></div>

+    	<div id="maincol-left">

+      	<h1>Download Tor for Unix, Linux, BSD</h1>

+

+        <!-- BEGIN TEASER WARNING -->

+      	<div class="warning">

+          <h2>Want Tor to really work?</h2>

+<p>...then please don't just install it and go on.  You need to change some of your habits, and reconfigure your software! Tor by itself is <em>NOT</em> all you need to maintain your anonymity. Read the <a href="#warning">full list of warnings</a>.

+</p>

+        </div>

+        <!-- END TEASER WARNING -->

+        <table class="topforty">

 <thead>

 <tr bgcolor="#009933" style="color: white; ">

-<th colspan="2">Platform</th>

-<th>Download Stable</th>

-<th>Download Unstable</th>

-<th>Installation and Configuration</th>

-</tr> </thead>

+  <th colspan="2">Platform</th>

+  <th>Download Stable</th>

+  <th>Download Unstable</th>

+  <th>Installation and Configuration</th>

+</tr>

+</thead>

 <tr>

 <td align="center"><img src="images/distros/debian.png" alt="Debian" /> <img src="images/distros/ubuntu.png" alt="Ubuntu" /> <img src="images/distros/knoppix.png" alt="Knoppix" /></td>

@@ -33,7 +33,7 @@ Please take time to read the <a href="#Warning">warning</a> to familiarize yours

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

 </tr>

-<tr bgcolor="e5e5e5">

+<tr class="beige">

 <td align="center"><img src="images/distros/centos.png" alt="CentOS" /> <img src="images/distros/fedora.png" alt="Fedora" /> <img src="images/distros/suse.png" alt="openSUSE 11" /></td>

 <td>CentOS, Fedora, OpenSUSE</td>

 <td colspan="2"><a href="<page docs/rpms>">repository packages</a> </td>

@@ -49,7 +49,7 @@ Please take time to read the <a href="#Warning">warning</a> to familiarize yours

 </td>

 </tr>

-<tr bgcolor="e5e5e5">

+<tr class="beige">

 <td align="center"><img src="images/distros/freebsd.png" alt="FreeBSD" /></td>

 <td>FreeBSD</td>

 <td colspan="2"><kbd>portinstall -s security/tor</kbd></td>

@@ -62,18 +62,18 @@ Please take time to read the <a href="#Warning">warning</a> to familiarize yours

 <td colspan="2"><kbd>cd /usr/ports/net/tor &amp;&amp; make &amp;&amp; make install</kbd></td>

 <td>

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

-<a href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/OpenbsdChrootedTor">Guide to chrooting Tor in OpenBSD</a>

+<a href="<wiki>/TheOnionRouter/OpenbsdChrootedTor">Guide to chrooting Tor in OpenBSD</a>

 </td>

 </tr>

-<tr bgcolor="e5e5e5">

+<tr class="beige">

 <td align="center"><img src="images/distros/netbsd.png" alt="NetBSD" /></td>

 <td>NetBSD</td>

 <td colspan="2"><kbd>cd /usr/pkgsrc/net/tor &amp;&amp; make install</kbd></td>

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

 </tr>

-<tr bgcolor="e5e5e5">

+<tr class="beige">

 <td align="center"><img src="images/distros/terminal.png" alt="Source code" /></td>

 <td>Source tarballs</td>

 <td>

@@ -89,7 +89,6 @@ Please take time to read the <a href="#Warning">warning</a> to familiarize yours

 </table>

-<div class="underline"></div>

 <div class="nb">

 <a id="packagediff"></a>

 <h2><a class="anchor" href="#packagediff">What's the difference between Stable &amp; Unstable?</a></h2>

@@ -140,106 +139,12 @@ the list's RSS feed</a>.

 </form>

 </div>

-<div class="underline"></div>

-<div class="warning">

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

-<h2><a class="anchor" href="#Warning">Warning: Want Tor to really

-work?</a></h2>

-

-<p>

-...then please don't just install it and go on.  You need to change

-some of your habits, and reconfigure your software!

-Tor by itself is <em>NOT</em> all you need to maintain your anonymity.

-There are several major pitfalls to watch out for:

-</p>

-

-<ol>

-<li>

-Tor only protects Internet applications that are configured to

-send their traffic through Tor — it doesn't magically anonymize

-all your traffic just because you install it.  We recommend you

-use <a href="http://www.mozilla.com/en-US/firefox/all-older.html">Firefox</a> with the <a

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

-</li>

-

-<li>

-Browser plugins such as Java, Flash, ActiveX, RealPlayer,

-Quicktime, Adobe's PDF plugin, and others can be manipulated

-into revealing your IP address. You should probably

-<a href="http://plugindoc.mozdev.org/faqs/uninstall.html">uninstall your

-plugins</a>

-(go to "about:plugins" to see what is installed), or investigate <a

-href="https://addons.mozilla.org/firefox/1237/">QuickJava</a>, <a

-href="https://addons.mozilla.org/firefox/433/">FlashBlock</a>, and

-<a href="http://noscript.net/">NoScript</a>

-if you really need them. Consider removing extensions that look up

-more information about the websites you type in (like Google toolbar),

-as they may bypass Tor and/or broadcast sensitive information. Some

-people prefer using two browsers (one for Tor, one for unsafe browsing).

-</li>

-

-<li>

-Beware of cookies: if you ever browse without Tor 

-and a site gives you a cookie, that cookie could identify you even when

-you start using Tor again. You should clear your cookies frequently. <a

-href="https://addons.mozilla.org/firefox/82/">CookieCuller</a> can help

-protect any cookies you do not want to lose.

-</li>

-

-<li>

-Tor anonymizes the origin of your traffic,

-and it encrypts everything inside the Tor network, but <a

-href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#ExitEavesdroppers">it

-can't encrypt your traffic between the Tor network and its final

-destination.</a>

-If you are communicating sensitive information, you should use as much

-care as you would on the normal scary Internet — use HTTPS or other

-end-to-end encryption and authentication.

-</li>

-

-<li>

-While Tor blocks attackers

-on your local network from discovering or influencing your destination,

-it opens new risks: malicious or misconfigured Tor exit nodes can send

-you the wrong page, or even send you embedded Java applets disguised as

-domains you trust.

-</li>

-</ol>

-

-<br />

-<p>

-Be smart and learn more. Understand what Tor does and does not offer.

-This list of pitfalls isn't complete, and we need your

-help <a href="<page getinvolved/volunteer>#Documentation">identifying and documenting

-all the issues</a>.

-</p>

-</div>

-

-<div class="underline"></div>

-<div class="nb">

-<p>

-See our <a href="<page docs/verifying-signatures>">instructions

-on verifying package signatures</a>, which allows

-you to make sure you've downloaded the file we intended you to get.

-</p>

-

 <p>

 If you would like to research any past release of Tor source, packages,

 or other binaries, see <a href="http://archive.torproject.org/">the

 archive</a>.

 </p>

-<p>

-See the <a href="<page docs/documentation>#Developers">developer

-documentation</a> for instructions on fetching Tor from Git to get

-the very latest development version source code.

-You can also download the <a

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

-href="vidalia/dist/">Vidalia source</a>.

-</p>

-</div>

-

-<div class="underline"></div>

 <div class="nb">

 <p>

 If you have trouble downloading Tor from this site, here is a <a

@@ -256,6 +161,36 @@ changes in both stable and development versions, see the

 <a href="<gitblob>ChangeLog">ChangeLog</a>.

 </p>

 </div>

-</div><!-- #main -->

+      </div>

+      <!-- END MAINCOL -->

+      <div id="sidecol-right">

+        <div class="img-shadow">

+          <div class="infoblock">

+          	<h2>Verify Signatures</h2>

+            <p>Verify your downloads with our PGP signatures:</p>

+            <a href="<page docs/verifying-signatures>">Read how to

+verify the signatures</a>.

+          </div>

+        </div>

+        <!-- END INFOBLOCK -->

+        <div class="img-shadow">

+        	<div class="sidenav-sub">

+          	<h2>Having Trouble?</h2>

+          	<ul>

+            	<li class="dropdown"><a href="#">What are the differences between stable and unstable downloads?</a></li>

+            	<li class="dropdown"><a href="#">Why is the TorBrowser Bundle only available for Windows?</a></li>

+            	<li class="dropdown"><a href="#">What is the Expert Developer Package?</a></li>

+            	<li class="dropdown"><a href="#">What are the differences between stable and unstable downloads?</a></li>

+            	<li class="dropdown"><a href="#">Why is the TorBrowser Bundle only available for Windows?</a></li>

+            	<li class="dropdown"><a href="#">What is the Expert Developer Package?</a></li>

+            </ul>

+          </div>

+      	</div>

+        <!-- END SIDENAV -->

+      </div>

+      <!-- END SIDECOL -->

+    </div>

+    <!-- END CONTENT -->

+

 #include <foot.wmi>

@@ -12,7 +12,7 @@

 Warning: Want Tor to really work?  ...then please don't just install it

 and go on. You need to change some of your habits, and reconfigure your

 software! Tor by itself is NOT all you need to maintain your anonymity.

-Please take time to read the <a href="<page download-unix>#Warning">warning</a> to familiarize yourself with the pitfalls and limits of Tor.

+Please take time to read the <a href="#Warning">warning</a> to familiarize yourself with the pitfalls and limits of Tor.

 </div>

 <div class="underline"></div>

@@ -73,28 +73,6 @@ Please take time to read the <a href="<page download-unix>#Warning">warning</a>

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

 </tr>

-<tr>

-<td align="center"><img src="images/distros/200px-Maemo_logo_color.svg.png" alt="Maemo" /></td>

-<td>Maemo / N900</td>

-<td colspan="2"><a href="<page docs/N900>">Experimental instructions</a></td>

-<td></td>

-</tr>

-

-<tr bgcolor="e5e5e5">

-<td align="center"><img src="images/distros/android-market.gif" alt="Android" width="32" height="32"/></td>

-<td>Android</td>

-<td></td>

-<td><a href="<package-androidbundle-alpha>"><version-androidbundle-tor></a> (<a href="<package-androidbundle-alpha-sig>">sig</a>)</td>

-<td><a href="<page docs/android>">Android instructions and information</a></td>

-</tr>

-

-<tr>

-<td align="center"><img src="images/distros/apple.png" alt="Apple iPhone/iPod Touch" /></td>

-<td>Apple iPhone/iPod Touch</td>

-<td colspan="2"><a href="http://sid77.slackware.it/iphone/">Test packages by Marco</a></td>

-<td></td>

-</tr>

-

 <tr bgcolor="e5e5e5">

 <td align="center"><img src="images/distros/terminal.png" alt="Source code" /></td>

 <td>Source tarballs</td>

@@ -132,14 +110,14 @@ serious reliability and security bugs in these downloads.  Please be prepared to

 <p>

 Tor is distributed as <a href="http://www.fsf.org/">Free Software</a>

 under the <a href="<gitblob>LICENSE">3-clause BSD license</a>. The

-bundles also include <a href="<page vidalia/index>">Vidalia</a>

+bundles also include <a href="<page projects/vidalia>">Vidalia</a>

 and <a href="http://www.pps.jussieu.fr/~jch/software/polipo/">Polipo</a>, which are supporting

 applications distributed under the GNU GPL.

 </p>

 <p>

 There is no fee for installing Tor, or using the Tor network, but

 if you want Tor to become faster and more usable please consider

-<a href="<page donate>">making a tax-deductible donation to The Tor Project</a>.

+<a href="<page donate/donate>">making a tax-deductible donation to The Tor Project</a>.

 </p>

 </div>

@@ -232,7 +210,7 @@ domains you trust.

 <p>

 Be smart and learn more. Understand what Tor does and does not offer.

 This list of pitfalls isn't complete, and we need your

-help <a href="<page volunteer>#Documentation">identifying and documenting

+help <a href="<page getinvolved/volunteer>#Documentation">identifying and documenting

 all the issues</a>.

 </p>

 </div>

@@ -240,7 +218,7 @@ all the issues</a>.

 <div class="underline"></div>

 <div class="nb">

 <p>

-See our <a href="<page verifying-signatures>">instructions

+See our <a href="<page docs/verifying-signatures>">instructions

 on verifying package signatures</a>, which allows

 you to make sure you've downloaded the file we intended you to get.

 </p>

@@ -252,7 +230,7 @@ archive</a>.

 </p>

 <p>

-See the <a href="<page documentation>#Developers">developer

+See the <a href="<page docs/documentation>#Developers">developer

 documentation</a> for instructions on fetching Tor from Git to get

 the very latest development version source code.

 You can also download the <a

@@ -265,7 +243,7 @@ href="vidalia/dist/">Vidalia source</a>.

 <div class="nb">

 <p>

 If you have trouble downloading Tor from this site, here is a <a

-href="<page mirrors>">list of sites mirroring the Tor site</a>.

+href="<page getinvolved/mirrors>">list of sites mirroring the Tor site</a>.

 </p>

 <a id="ChangeLog"></a>

new file mode 100644

@@ -0,0 +1,283 @@

+## translation metadata

+# Revision: $Revision: 22543 $

+# Translation-Priority: 3-low

+

+#include "head.wmi" TITLE="Tor: Download for Linux/Unix" CHARSET="UTF-8" ANNOUNCE_RSS="yes"

+

+<div class="main-column">

+

+<h2>Available Linux/Unix Packages</h2>

+<div class="warning">

+

+Warning: Want Tor to really work?  ...then please don't just install it

+and go on. You need to change some of your habits, and reconfigure your

+software! Tor by itself is NOT all you need to maintain your anonymity.

+Please take time to read the <a href="<page download-unix>#Warning">warning</a> to familiarize yourself with the pitfalls and limits of Tor.

+</div>

+

+<div class="underline"></div>

+

+<table cellpadding="6" cellspacing="1" border="0" width="100%">

+<thead>

+<tr bgcolor="#009933" style="color: white; ">

+<th colspan="2">Platform</th>

+<th>Download Stable</th>

+<th>Download Unstable</th>

+<th>Installation and Configuration</th>

+</tr> </thead>

+

+<tr>

+<td align="center"><img src="images/distros/debian.png" alt="Debian" /> <img src="images/distros/ubuntu.png" alt="Ubuntu" /> <img src="images/distros/knoppix.png" alt="Knoppix" /></td>

+<td>Debian, Ubuntu, Knoppix</td>

+<td colspan="2"><a href="<page docs/debian>">repository packages</a> </td>

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

+</tr>

+

+<tr bgcolor="e5e5e5">

+<td align="center"><img src="images/distros/centos.png" alt="CentOS" /> <img src="images/distros/fedora.png" alt="Fedora" /> <img src="images/distros/suse.png" alt="openSUSE 11" /></td>

+<td>CentOS, Fedora, OpenSUSE</td>

+<td colspan="2"><a href="<page docs/rpms>">repository packages</a> </td>

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

+</tr>

+

+<tr>

+<td align="center"><img src="images/distros/gentoo.png" alt="Gentoo Linux" /></td>

+<td>Gentoo Linux</td>

+<td colspan="2"><kbd>emerge tor</kbd></td>

+<td>

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

+</td>

+</tr>

+

+<tr bgcolor="e5e5e5">

+<td align="center"><img src="images/distros/freebsd.png" alt="FreeBSD" /></td>

+<td>FreeBSD</td>

+<td colspan="2"><kbd>portinstall -s security/tor</kbd></td>

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

+</tr>

+

+<tr>

+<td align="center"><img src="images/distros/openbsd.png" alt="OpenBSD" /></td>

+<td>OpenBSD</td>

+<td colspan="2"><kbd>cd /usr/ports/net/tor &amp;&amp; make &amp;&amp; make install</kbd></td>

+<td>

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

+<a href="https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/OpenbsdChrootedTor">Guide to chrooting Tor in OpenBSD</a>

+</td>

+</tr>

+

+<tr bgcolor="e5e5e5">

+<td align="center"><img src="images/distros/netbsd.png" alt="NetBSD" /></td>

+<td>NetBSD</td>

+<td colspan="2"><kbd>cd /usr/pkgsrc/net/tor &amp;&amp; make install</kbd></td>

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

+</tr>

+

+<tr>

+<td align="center"><img src="images/distros/200px-Maemo_logo_color.svg.png" alt="Maemo" /></td>

+<td>Maemo / N900</td>

+<td colspan="2"><a href="<page docs/N900>">Experimental instructions</a></td>

+<td></td>

+</tr>

+

+<tr bgcolor="e5e5e5">

+<td align="center"><img src="images/distros/android-market.gif" alt="Android" width="32" height="32"/></td>

+<td>Android</td>

+<td></td>

+<td><a href="<package-androidbundle-alpha>"><version-androidbundle-tor></a> (<a href="<package-androidbundle-alpha-sig>">sig</a>)</td>

+<td><a href="<page docs/android>">Android instructions and information</a></td>

+</tr>

+

+<tr>

+<td align="center"><img src="images/distros/apple.png" alt="Apple iPhone/iPod Touch" /></td>

+<td>Apple iPhone/iPod Touch</td>

+<td colspan="2"><a href="http://sid77.slackware.it/iphone/">Test packages by Marco</a></td>

+<td></td>

+</tr>

+

+<tr bgcolor="e5e5e5">

+<td align="center"><img src="images/distros/terminal.png" alt="Source code" /></td>

+<td>Source tarballs</td>

+<td>

+<a href="<package-source-stable>"><version-stable></a>

+ (<a href="<package-source-stable-sig>">sig</a>)

+</td>

+<td>

+<a href="<package-source-alpha>"><version-alpha></a>

+ (<a href="<package-source-alpha-sig>">sig</a>)

+</td>

+<td><kbd>./configure &amp;&amp; make &amp;&amp; src/or/tor</kbd></td>

+</tr>

+

+</table>

+

+<div class="underline"></div>

+<div class="nb">

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

+<h2><a class="anchor" href="#packagediff">What's the difference between Stable &amp; Unstable?</a></h2>

+

+<p>

+Stable packages are released when we believe the features and code will

+not change for many months.

+</p>

+<p>

+Unstable packages are released so you can help us test new features and bugfixes. Even though they have a higher version number

+than the stable versions listed above, there is a much higher chance of

+serious reliability and security bugs in these downloads.  Please be prepared to <a href="https://bugs.torproject.org/">report bugs</a>.

+</p>

+</div>

+

+<div class="underline"></div>

+<div class="nb">

+<p>

+Tor is distributed as <a href="http://www.fsf.org/">Free Software</a>

+under the <a href="<gitblob>LICENSE">3-clause BSD license</a>. The

+bundles also include <a href="<page vidalia/index>">Vidalia</a>

+and <a href="http://www.pps.jussieu.fr/~jch/software/polipo/">Polipo</a>, which are supporting

+applications distributed under the GNU GPL.

+</p>

+<p>

+There is no fee for installing Tor, or using the Tor network, but

+if you want Tor to become faster and more usable please consider

+<a href="<page donate>">making a tax-deductible donation to The Tor Project</a>.

+</p>

+</div>

+

+<div class="underline"></div>

+<div class="nb">

+<p>

+To keep informed of security advisories and new stable releases, subscribe

+to the <a href="http://archives.seul.org/or/announce/">or-announce

+mailing list</a> (you will be asked to confirm via email). You can also

+<a href="http://rss.gmane.org/gmane.network.onion-routing.announce">watch

+the list's RSS feed</a>.

+</p>

+

+<form action="http://freehaven.net/cgi-bin/majordomo.cgi">

+<input type="hidden" name="mlist" value="or-announce"/>

+<input type="hidden" name="subscribe" value="1"/>

+<input type="hidden" name="host" value="freehaven.net"/>

+<input name="email" size="15"/>

+<input type="submit" value="subscribe to or-announce"/>

+</form>

+</div>

+

+<div class="underline"></div>

+<div class="warning">

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

+<h2><a class="anchor" href="#Warning">Warning: Want Tor to really

+work?</a></h2>

+

+<p>

+...then please don't just install it and go on.  You need to change

+some of your habits, and reconfigure your software!

+Tor by itself is <em>NOT</em> all you need to maintain your anonymity.

+There are several major pitfalls to watch out for:

+</p>

+

+<ol>

+<li>

+Tor only protects Internet applications that are configured to

+send their traffic through Tor — it doesn't magically anonymize

+all your traffic just because you install it.  We recommend you

+use <a href="http://www.mozilla.com/en-US/firefox/all-older.html">Firefox</a> with the <a

+href="https://addons.mozilla.org/firefox/2275/">Torbutton</a> extension.

+</li>

+

+<li>

+Browser plugins such as Java, Flash, ActiveX, RealPlayer,

+Quicktime, Adobe's PDF plugin, and others can be manipulated