Author: atagar Date: 2013-03-04 16:37:03 +0000 (Mon, 04 Mar 2013) New Revision: 26070

Modified: website/trunk/getinvolved/en/volunteer.wml Log: Merging TBB and TorBrowser on the volunteer page

The TBB and TorBrowser projects link to the same landing page, the same code, and the same bug tracker. May as well make them the same entry. :P

Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2013-03-04 04:25:57 UTC (rev 26069) +++ website/trunk/getinvolved/en/volunteer.wml 2013-03-04 16:37:03 UTC (rev 26070) @@ -105,22 +105,14 @@ </tr>

<tr> - <td><a href="#project-tbb">TBB</a></td> - <td>Bundle</td> - <td>Sys Admin</td> - <td>Moderate</td> - <td>Erinn</td> - </tr> - - <tr class="alt"> <td><a href="#project-torbrowser">Tor Browser</a></td> - <td>Browser</td> + <td>Bundle</td> <td>C</td> <td>Moderate</td> - <td>mikeperry, pearl crescent</td> + <td>mikeperry, Erinn</td> </tr>

- <tr> + <tr class="alt"> <td><a href="#project-torbutton">Torbutton</a></td> <td>Browser Add-on</td> <td>Javascript</td> @@ -128,7 +120,7 @@ <td>mikeperry</td> </tr>

- <tr class="alt"> + <tr> <td><a href="#project-httpseverywhere">HTTPS Everywhere</a></td> <td>Browser Add-on</td> <td>Javascript</td> @@ -136,7 +128,7 @@ <td>pde, mikeperry</td> </tr>

- <tr> + <tr class="alt"> <td><a href="#project-vidalia">Vidalia</a></td> <td>User Interface</td> <td>C++, Qt</td> @@ -144,7 +136,7 @@ <td>chiiph</td> </tr>

- <tr class="alt"> + <tr> <td><a href="#project-arm">Arm</a></td> <td>User Interface</td> <td>Python, Curses</td> @@ -152,7 +144,7 @@ <td>atagar</td> </tr>

- <tr> + <tr class="alt"> <td><a href="#project-orbot">Orbot</a></td> <td>User Interface</td> <td>Java</td> @@ -160,7 +152,7 @@ <td>n8fr8, ioerror</td> </tr>

- <tr class="alt"> + <tr> <td><a href="#project-tails">Tails</a></td> <td>OS image</td> <td>Sys Admin</td> @@ -168,7 +160,7 @@ <td><a href="https://tails.boum.org/">#tails</a></td> </tr>

- <tr> + <tr class="alt"> <td><a href="#project-torramdisk">tor-ramdisk</a></td> <td>OS image</td> <td>Sys Admin</td> @@ -176,7 +168,7 @@ <td>blueness</td> </tr>

- <tr class="alt"> + <tr> <td>*<a href="#project-torouter">Torouter</a></td> <td>OS image</td> <td>Sys Admin</td> @@ -184,7 +176,7 @@ <td>ioerror</td> </tr>

- <tr> + <tr class="alt"> <td><a href="#project-torsocks">Torsocks</a></td> <td>Usability</td> <td>C</td> @@ -192,7 +184,7 @@ <td>ioerror, nickm</td> </tr>

- <tr class="alt"> + <tr> <td><a href="#project-torbirdy">TorBirdy</a></td> <td>Browser Add-on</td> <td>JavaScript</td> @@ -200,7 +192,7 @@ <td>Sukhbir (sukhe), ioerror</td> </tr>

- <tr> + <tr class="alt"> <td><a href="#project-obfsproxy">Obfsproxy</a></td> <td>Client Add-on</td> <td>C, Python</td> @@ -208,7 +200,7 @@ <td>asn, nickm</td> </tr>

- <tr class="alt"> + <tr> <td><a href="#project-flash-proxy">Flash Proxy</a></td> <td>Client Add-on</td> <td>Python, JavaScript, Go</td> @@ -216,7 +208,7 @@ <td>dcf, aallai, jct</td> </tr>

- <tr> + <tr class="alt"> <td>*<a href="#project-thandy">Thandy</a></td> <td>Updater</td> <td>Python</td> @@ -224,7 +216,7 @@ <td>chiiph, Erinn, nickm</td> </tr>

- <tr class="alt"> + <tr> <td><a href="#project-shadow">Shadow</a></td> <td>Simulator</td> <td>C, Python</td> @@ -232,7 +224,7 @@ <td>robgjansen</td> </tr>

- <tr> + <tr class="alt"> <td><a href="#project-stem">Stem</a></td> <td>Library</td> <td>Python</td> @@ -240,7 +232,7 @@ <td>atagar, neena</td> </tr>

- <tr class="alt"> + <tr> <td><a href="#project-txtorcon">Txtorcon</a></td> <td>Library</td> <td>Python, Twisted</td> @@ -248,7 +240,7 @@ <td>meejah</td> </tr>

- <tr> + <tr class="alt"> <td><a href="#project-tlsdate">Tlsdate</a></td> <td>Utility</td> <td>C</td> @@ -256,7 +248,7 @@ <td>ioerror</td> </tr>

- <tr class="alt"> + <tr> <td><a href="#project-metrics">Metrics</a></td> <td>Client Service</td> <td>Java</td> @@ -264,7 +256,7 @@ <td>karsten</td> </tr>

- <tr> + <tr class="alt"> <td><a href="#project-atlas">Atlas</a></td> <td>Client Service</td> <td>JavaScript</td> @@ -272,7 +264,7 @@ <td>hellais</td> </tr>

- <tr class="alt"> + <tr> <td><a href="#project-torstatus">TorStatus</a></td> <td>Client Service</td> <td>Python, Django</td> @@ -280,7 +272,7 @@ <td></td> </tr>

- <tr> + <tr class="alt"> <td><a href="#project-compass">Compass</a></td> <td>Client Service</td> <td>Python</td> @@ -288,7 +280,7 @@ <td>gsathya, karsten</td> </tr>

- <tr class="alt"> + <tr> <td><a href="#project-onionoo">Onionoo</a></td> <td>Backend Service</td> <td>Java, Python</td> @@ -296,7 +288,7 @@ <td>karsten, gsathya</td> </tr>

- <tr> + <tr class="alt"> <td><a href="#project-weather">Weather</a></td> <td>Client Service</td> <td>Python</td> @@ -304,7 +296,7 @@ <td>kaner</td> </tr>

- <tr class="alt"> + <tr> <td><a href="#project-gettor">GetTor</a></td> <td>Client Service</td> <td>Python</td> @@ -312,7 +304,7 @@ <td>kaner</td> </tr>

- <tr> + <tr class="alt"> <td><a href="#project-torcheck">TorCheck</a></td> <td>Client Service</td> <td>Python, Perl</td> @@ -320,7 +312,7 @@ <td>ioerror</td> </tr>

- <tr class="alt"> + <tr> <td><a href="#project-bridgedb">BridgeDB</a></td> <td>Backend Service</td> <td>Python</td> @@ -328,7 +320,7 @@ <td>kaner, nickm</td> </tr>

- <tr> + <tr class="alt"> <td><a href="#project-ooni-probe">Ooni Probe</a></td> <td>Scanner</td> <td>Python</td> @@ -336,7 +328,7 @@ <td>hellais, isis, ioerror</td> </tr>

- <tr class="alt"> + <tr> <td><a href="#project-torflow">TorFlow</a></td> <td>Backend Service</td> <td>Python</td> @@ -344,7 +336,7 @@ <td>aagbsn, mikeperry</td> </tr>

- <tr> + <tr class="alt"> <td>*<a href="#project-torbel">TorBEL</a></td> <td>Backend Service</td> <td>Python</td> @@ -352,7 +344,7 @@ <td>Sebastian</td> </tr>

- <tr class="alt"> + <tr> <td><a href="#project-tor2web">Tor2web</a></td> <td>Client Service</td> <td>Python</td> @@ -360,7 +352,7 @@ <td>hellais</td> </tr>

- <tr> + <tr class="alt"> <td><a href="#project-anonbib">Anonbib</a></td> <td>Website</td> <td>Python</td> @@ -407,7 +399,7 @@ isn't yet complete, and has been inactive since Fall 2010. </p>

- <a id="project-tbb"></a> + <a id="project-torbrowser"></a> <h3><a href="<page projects/torbrowser>">Tor Browser Bundle</a> (<a href="https://gitweb.torproject.org/torbrowser.git">code</a>, <a href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Tor+bundles/installation&order=priority">bug @@ -416,7 +408,8 @@ <p> The Tor Browser Bundle is an easy-to-use portable package of Tor, Vidalia, Torbutton, and a Firefox fork preconfigured to work together out of - the box. This is actively being worked on by Erinn Clark. + the box. It contains a modified copy of Firefox that aims to resolve the + privacy and security issues in mainline version. </p>

<!-- @@ -427,17 +420,6 @@ </p> -->

- <a id="project-torbrowser"></a> - <h3><a href="<page projects/torbrowser>">Tor Browser</a> (<a - href="https://gitweb.torproject.org/torbrowser.git%22%3Ecode</a>, <a - href="https://trac.torproject.org/projects/tor/query?status=accepted&status=as... - tracker</a>)</h3> - - <p> - The Tor Browser is a modified Firefox that aims to resolve the privacy - and security issues in mainline Firefox. - </p> - <a id="project-torbutton"></a> <h3><a href="<page torbutton/index>">Torbutton</a> (<a href="https://gitweb.torproject.org/torbutton.git">code</a>, <a