tor-webwml.git

@@ -60,6 +60,20 @@ Linux / UNIX (but not OS X) wrapper to dynamically replace the networking

 system calls in your application with ones that point through Tor.</li>

 <li><a href="http://monkey.org/~dugsong/dsocks/">dsocks</a> is an

 alternative to tsocks that works on OS X / BSD.</li>

+</ul>

+

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

+<h3><a class="anchor" href="#Installers">Installers</a></h3>

+<ul>

+<li>The <a href="http://www.torproject.org/torbrowser/">Tor Browser Bundle</a>

+is a zero-install version of Tor that can be run from the Desktop or a USB

+flash drive. We have TBBs for Windows and Linux, and at some point there

+will be a TBB for Mac OS X.</li>

+<li>debs, rpms</li>

+<li>osx image</li>

+<li>torvm</li>

+<li>livecd's: <a href="https://amnesia.boum.org/">The (Amnesic)

+Incognito Live System</a>, tor ramdisk</li>

 <li><a

 href="https://git.torproject.org/checkout/thandy/master/">Thandy</a>,

 our still-under-development <a

@@ -75,23 +89,14 @@ href="https://data.peertech.org/files/demo/updater/index.html">network

 installer</a>.</li>

 </ul>

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

-<h3><a class="anchor" href="#Installers">Installers</a></h3>

-<ul>

-<li>TBB, TBB-for-Linux</li>

-<li>debs, rpms</li>

-<li>osx image</li>

-<li>torvm</li>

-<li>orbot</li>

-<li>livecd's: <a href="https://amnesia.boum.org/">The (Amnesic)

-Incognito Live System</a>, tor ramdisk</li>

-</ul>

-

 <a id="Implementations"></a>

 <h3><a class="anchor" href="#Implementations">Alternate Tor implementations</a></h3>

 <ul>

-<li>xmux's thing</li>

-<li>onioncoffee</li>

+<li><a href="http://www.torproject.org/docs/android.html.en">Orbot</a> is

+an Android version of Tor that internally depends on the Tor binary.</li>

+<li><a href="http://github.com/brl/JTor.git">JTor</a> is an independent

+client implementation of Tor written in Java.</li>

+<li><a href="http://onioncoffee.sourceforge.net/">OnionCoffee</a> is an outdated Tor client implementation in Java.</li>

 <li>tortunnel</li>

 <li>jap?</li>

 </ul>

@@ -101,10 +106,13 @@ Incognito Live System</a>, tor ramdisk</li>

 <ul>

 <li>torstatus</li>

 <li>xenobite's torstatus</li>

-<li>check.torproject.org</li>

-<li>bulk exitlist</li>

-<li>tordnsel</li>

-<li>moria1's v3 votes export</li>

+<li><a href="https://check.torproject.org/">check.torproject.org</a> is a

+website that asks TorDNSEL whether a user is using Tor.</li>

+<li>The <a href="https://check.torproject.org/cgi-bin/TorBulkExitList.py">Bulk

+Tor Exit List Exporter</a> is a tool that uses TorDNSEL to export a list

+of possible Tor nodes that might contact a given IP address.</li>

+<li><a href="https://www.torproject.org/tordnsel/">TorDNSEL</a> is an

+active testing, DNS-based list of Tor exit nodes.</li>

 </ul>

 <a id="Monitoring"></a>

@@ -112,7 +120,6 @@ Incognito Live System</a>, tor ramdisk</li>

 <ul>

 <li>weather</li>

 <li><a href="http://metrics.torproject.org/">Metrics Project: Measuring the Tor Network</a></li>

-<li>torperf</li>

 <li>archives</li>

 <li>https://svn.torproject.org/svn/projects/archives/trunk/exonerator/HOWTO</li>

 </ul>

@@ -120,6 +127,10 @@ Incognito Live System</a>, tor ramdisk</li>

 <a id="Performance"></a>

 <h3><a class="anchor" href="#Performance">Network Performance</a></h3>

 <ul>

+<li><a href="https://svn.torproject.org/svn/torperf/trunk/README">TorPerf</a>

+is a little tool that measures Tor's performance as users experience it.

+TorPerf uses a trivial SOCKS client to download files of various sizes

+over the Tor network and notes how long substeps take.</li>

 <li>whytorisslow</li>

 <li>torflow</li>

 <li>bwauthority</li>

@@ -148,17 +159,18 @@ Incognito Live System</a>, tor ramdisk</li>

 <a id="Infrastructure"></a>

 <h3><a class="anchor" href="#Infrastructure">Infrastructure</a></h3>

 <ul>

-<li>bug tracker (flyspray)</li>

-<li>blog</li>

-<li>wiki</li>

-<li>pootle, translation.tp.o</li>

+<li><a href="https://trac.torproject.org/projects/tor">Tor Bug Tracker

+&amp; Wiki<a> based on Trac</li>

+<li><a href="https://blog.torproject.org/">The Tor Blog based on Drupal</a></li>

+<li><a href="https://translation.torproject.org/">The Tor Translation

+Portal</a> based on Pootle</li>

 <li>buildbot https://buildbot.vidalia-project.net/one_line_per_build</li>

 <li>https://data.peertech.org/torbld</li>

-<li>tor mirrors</li>

+<li><a href="http://www.torproject.org/mirrors.html.en">Tor Mirrors</a></li>

 <li>rsync</li>

 <li>a nagios?</li>

 <li>git, svn</li>

-<li>gitweb</li>

+<li><a href="https://gitweb.torproject.org/">Tor Gitweb</a></li>

 </ul>

 <a id="HiddenServices"></a>

@@ -173,7 +185,9 @@ Incognito Live System</a>, tor ramdisk</li>

 <a id="Other"></a>

 <h3><a class="anchor" href="#Other">Other</a></h3>

 <ul>

-<li>puppetor</li>

+<li><a href="https://git.torproject.org/puppetor.git/README">PuppeTor</a>

+is a Java framework that facilitates setting up a private Tor network and

+control its Tor processes.</li>

 <li>torwall</li>

 <li>topf</li>

 <li>nym</li>