add a bunch more projects; rearrange them; strip whitespace (d9e2550d2)

@@ -124,7 +124,7 @@ meetings around the world.</li>
         <td>Core</td>
         <td>C</td>
         <td>Heavy</td>
-        <td>nickm, arma, Sebastian</td>
+        <td>nickm, athena, arma</td>
       </tr>
 
       <tr class="alt">
@@ -137,34 +137,34 @@ meetings around the world.</li>
 
       <tr>
         <td><a href="#project-tbb">TBB</a></td>
-        <td>Usability</td>
+        <td>Bundle</td>
         <td>Sys Admin</td>
         <td>Moderate</td>
         <td>Erinn</td>
       </tr>
 
       <tr class="alt">
-        <td><a href="#project-tails">Tails</a></td>
-        <td>Usability</td>
-        <td>Sys Admin</td>
-        <td>Heavy</td>
-        <td><a href="https://tails.boum.org/">#tails</a></td>
+        <td><a href="#project-torbrowser">Tor Browser</a></td>
+        <td>Browser</td>
+        <td>C</td>
+        <td>Moderate</td>
+        <td>mikeperry, pearl crescent</td>
       </tr>
 
       <tr>
-        <td><a href="#project-torsocks">Torsocks</a></td>
-        <td>Usability</td>
-        <td>C</td>
-        <td>Heavy</td>
-        <td>ioerror, nickm</td>
+        <td><a href="#project-torbutton">Torbutton</a></td>
+        <td>Browser Add-on</td>
+        <td>Javascript</td>
+        <td>Moderate</td>
+        <td>mikeperry</td>
       </tr>
 
       <tr class="alt">
-        <td>*<a href="#project-torouter">Torouter</a></td>
-        <td>Usability</td>
-        <td>Sys Admin</td>
-        <td>Light</td>
-        <td>ioerror</td>
+        <td><a href="#project-httpseverywhere">HTTPS Everywhere</a></td>
+        <td>Browser Add-on</td>
+        <td>Javascript</td>
+        <td>Moderate</td>
+        <td>pde, mikeperry</td>
       </tr>
 
       <tr>
@@ -192,11 +192,43 @@ meetings around the world.</li>
       </tr>
 
       <tr class="alt">
-        <td><a href="#project-torbutton">Torbutton</a></td>
-        <td>Browser Add-on</td>
-        <td>Javascript</td>
-        <td>Moderate</td>
-        <td>mikeperry</td>
+        <td><a href="#project-tails">Tails</a></td>
+        <td>OS image</td>
+        <td>Sys Admin</td>
+        <td>Heavy</td>
+        <td><a href="https://tails.boum.org/">#tails</a></td>
+      </tr>
+
+      <tr>
+        <td><a href="#project-torramdisk">tor-ramdisk</a></td>
+        <td>OS image</td>
+        <td>Sys Admin</td>
+        <td>Light</td>
+        <td>blueness</td>
+      </tr>
+
+      <tr class="alt">
+        <td><a href="#project-torcloud">Tor cloud</a></td>
+        <td>OS image</td>
+        <td>Sys Admin</td>
+        <td>Light</td>
+        <td>runa</td>
+      </tr>
+
+      <tr>
+        <td>*<a href="#project-torouter">Torouter</a></td>
+        <td>OS image</td>
+        <td>Sys Admin</td>
+        <td>Light</td>
+        <td>ioerror</td>
+      </tr>
+
+      <tr class="alt">
+        <td><a href="#project-torsocks">Torsocks</a></td>
+        <td>Usability</td>
+        <td>C</td>
+        <td>Heavy</td>
+        <td>ioerror, nickm</td>
       </tr>
 
       <tr>
@@ -211,11 +243,19 @@ meetings around the world.</li>
         <td><a href="#project-obfsproxy">Obfsproxy</a></td>
         <td>Client Add-on</td>
         <td>C</td>
-        <td>Moderate</td>
+        <td>Light</td>
         <td>nickm, asn</td>
       </tr>
 
       <tr>
+        <td><a href="#project-pyobfsproxy">PyObfsproxy</a></td>
+        <td>Client Add-on</td>
+        <td>Python</td>
+        <td>Moderate</td>
+        <td>asn</td>
+      </tr>
+
+      <tr class="alt">
         <td><a href="#project-flash-proxy">Flash Proxy</a></td>
         <td>Client Add-on</td>
         <td>Python, JavaScript, Go</td>
@@ -223,6 +263,14 @@ meetings around the world.</li>
         <td>dcf, aallai, jct</td>
       </tr>
 
+      <tr>
+        <td><a href="#project-brdgrd">bridge-guard</a></td>
+        <td>Client Add-on</td>
+        <td>C</td>
+        <td>Light</td>
+        <td>phw</td>
+      </tr>
+
       <tr class="alt">
         <td>*<a href="#project-thandy">Thandy</a></td>
         <td>Updater</td>
@@ -232,27 +280,27 @@ meetings around the world.</li>
       </tr>
 
       <tr>
-        <td>*<a href="#project-ooni-probe">Ooni Probe</a></td>
-        <td>Scanner</td>
-        <td>Python</td>
-        <td>Moderate</td>
-        <td>hellais, isis, ioerror</td>
-      </tr>
-      
-      <tr class="alt">
         <td><a href="#project-shadow">Shadow</a></td>
-        <td>Experimentation</td>
+        <td>Simulator</td>
         <td>C, Python</td>
         <td>Moderate</td>
         <td>robgjansen</td>
       </tr>
 
+      <tr class="alt">
+        <td><a href="#project-experimentor">ExperimenTor</a></td>
+        <td>Simulator</td>
+        <td>C, Perl</td>
+        <td>Light</td>
+        <td></td>
+      </tr>
+
       <tr>
-        <td><a href="#project-torctl">TorCtl</a></td>
-        <td>Library</td>
+        <td><a href="#project-chutney">Chutney</a></td>
+        <td>Simulator</td>
         <td>Python</td>
-        <td>None</td>
-        <td>aagbsn</td>
+        <td>Light</td>
+        <td>nickm</td>
       </tr>
 
       <tr class="alt">
@@ -272,14 +320,22 @@ meetings around the world.</li>
       </tr>
 
       <tr class="alt">
+        <td><a href="#project-torctl">TorCtl</a></td>
+        <td>Library</td>
+        <td>Python</td>
+        <td>None</td>
+        <td>aagbsn</td>
+      </tr>
+
+      <tr>
         <td><a href="#project-tlsdate">Tlsdate</a></td>
         <td>Utility</td>
         <td>C</td>
-        <td>Heavy</td>
+        <td>Light</td>
         <td>ioerror</td>
       </tr>
 
-      <tr>
+      <tr class="alt">
         <td><a href="#project-metrics">Metrics</a></td>
         <td>Client Service</td>
         <td>Java</td>
@@ -287,7 +343,7 @@ meetings around the world.</li>
         <td>karsten</td>
       </tr>
 
-      <tr class="alt">
+      <tr>
         <td><a href="#project-atlas">Atlas</a></td>
         <td>Client Service</td>
         <td>JavaScript</td>
@@ -295,7 +351,7 @@ meetings around the world.</li>
         <td>hellais</td>
       </tr>
 
-      <tr>
+      <tr class="alt">
         <td><a href="#project-torstatus">TorStatus</a></td>
         <td>Client Service</td>
         <td>Python, Django</td>
@@ -303,7 +359,7 @@ meetings around the world.</li>
         <td></td>
       </tr>
 
-      <tr class="alt">
+      <tr>
         <td><a href="#project-compass">Compass</a></td>
         <td>Client Service</td>
         <td>Python</td>
@@ -311,7 +367,23 @@ meetings around the world.</li>
         <td>gsathya, karsten</td>
       </tr>
 
+      <tr class="alt">
+        <td><a href="#project-torperf">Torperf</a></td>
+        <td>Client Service</td>
+        <td>C, Python</td>
+        <td>Light</td>
+        <td>karsten</td>
+      </tr>
+
       <tr>
+        <td><a href="#project-onionoo">Onionoo</a></td>
+        <td>Backend Service</td>
+        <td>Java, Python</td>
+        <td>Moderate</td>
+        <td>karsten, gsathya</td>
+      </tr>
+
+      <tr class="alt">
         <td><a href="#project-weather">Weather</a></td>
         <td>Client Service</td>
         <td>Python</td>
@@ -319,7 +391,7 @@ meetings around the world.</li>
         <td>kaner</td>
       </tr>
 
-      <tr class="alt">
+      <tr>
         <td><a href="#project-gettor">GetTor</a></td>
         <td>Client Service</td>
         <td>Python</td>
@@ -327,7 +399,7 @@ meetings around the world.</li>
         <td>kaner</td>
       </tr>
 
-      <tr>
+      <tr class="alt">
         <td><a href="#project-torcheck">TorCheck</a></td>
         <td>Client Service</td>
         <td>Python, Perl</td>
@@ -335,14 +407,6 @@ meetings around the world.</li>
         <td>ioerror</td>
       </tr>
 
-      <tr class="alt">
-        <td><a href="#project-onionoo">Onionoo</a></td>
-        <td>Backend Service</td>
-        <td>Java, Python</td>
-        <td>Moderate</td>
-        <td>karsten, gsathya</td>
-      </tr>
-      
       <tr>
         <td><a href="#project-bridgedb">BridgeDB</a></td>
         <td>Backend Service</td>
@@ -352,20 +416,45 @@ meetings around the world.</li>
       </tr>
 
       <tr class="alt">
+        <td>*<a href="#project-ooni-probe">Ooni Probe</a></td>
+        <td>Scanner</td>
+        <td>Python</td>
+        <td>Moderate</td>
+        <td>hellais, isis, ioerror</td>
+      </tr>
+
+      <tr>
         <td><a href="#project-torflow">TorFlow</a></td>
         <td>Backend Service</td>
         <td>Python</td>
         <td>None</td>
-        <td>aagbsn</td>
+        <td>aagbsn, mikeperry</td>
       </tr>
 
-      <tr>
+      <tr class="alt">
         <td>*<a href="#project-torbel">TorBEL</a></td>
         <td>Backend Service</td>
         <td>Python</td>
         <td>None</td>
         <td>Sebastian</td>
       </tr>
+
+      <tr>
+        <td><a href="#project-tor2web">Tor2web</a></td>
+        <td>Client Service</td>
+        <td>python</td>
+        <td>Light</td>
+        <td>hellais, others</td>
+      </tr>
+
+      <tr class="alt">
+        <td><a href="#project-anonbib">Anonbib</a></td>
+        <td>Website</td>
+        <td>python</td>
+        <td>Light</td>
+        <td>arma, nickm</td>
+      </tr>
+
     </table>
 
     <sub>
@@ -376,7 +465,7 @@ meetings around the world.</li>
 
     <a id="project-tor"></a>
     <h3>Tor (<a href="https://gitweb.torproject.org/tor.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+Client&component=Tor+Relay&component=vidalia&order=priority">bug
+    href="https://trac.torproject.org/projects/tor/report/12">bug
     tracker</a>)</h3>
 
     <p>
@@ -389,7 +478,7 @@ meetings around the world.</li>
     <b>Project Ideas:</b><br />
     <i><a href="#limitCapabilities">Run With Limited Capabilities</a></i><br />
     <i><a href="#torCleanup">Tor Codebase Cleanup</a></i><br />
-    <i><a href="#httpsImersonation">HTTPS Server Impersonation</a></i><br />
+    <i><a href="#httpsImpersonation">HTTPS Server Impersonation</a></i><br />
     <i><a href="#chutneyExpansion">Make Chutney Do More, More Reliably</a></i>
     </p>
 
@@ -409,12 +498,12 @@ meetings around the world.</li>
     <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
-    tracker</a>)</h3>
+    tracker</a>, <a href="https://www.torproject.org/projects/torbrowser/design/">design doc</a>)</h3>
 
     <p>
     The Tor Browser Bundle is an easy-to-use portable package of Tor, Vidalia,
-    and Firefox preconfigured to work together out of the box. This is actively
-    being worked on by Erinn Clark.
+    Torbutton, and a Firefox fork preconfigured to work together out of
+    the box. This is actively being worked on by Erinn Clark.
     </p>
 
     <!--
@@ -425,58 +514,41 @@ meetings around the world.</li>
     </p>
     -->
 
-    <a id="project-tails"></a>
-    <h3><a href="https://tails.boum.org/">The Amnesic Incognito Live System</a> (<a
-    href="http://git.immerda.ch/?p=amnesia.git;a=summary">code</a>, <a
-    href="https://tails.boum.org/bugs/">bug
+    <a id="project-torbrowser"></a>
+    <h3><a href="<page projects/torbrowser>">Tor Browser</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
     tracker</a>)</h3>
 
     <p>
-    The Amnesic Incognito Live System is a live CD/USB distribution
-    preconfigured so that everything is safely routed through Tor and leaves no
-    trace on the local system. This is a merger of the Amnesia and <a
-    href="http://www.anonymityanywhere.com/incognito/">Incognito</a> projects,
-    and still under very active development.
-    </p>
-    
-    <!--
-    <p>
-    <b>Project Ideas:</b><br />
-    <i><a href="#tailsHiddenServicePetnames">Petname system for Tor hidden
-    services</a></i><br />
-    <i><a href="#tailsServer">Tails server: Self-hosted services behind
-    Tails-powered Tor hidden services</a></i>
+    The Tor Browser is a modified Firefox that aims to resolve the privacy
+    and security issues in mainline Firefox.
     </p>
-    -->
 
-    <a id="project-torsocks"></a>
-    <h3><a href="http://code.google.com/p/torsocks/">Torsocks</a> (<a
-    href="https://gitweb.torproject.org/torsocks.git">code</a>, <a
-    href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Torify&order=priority">bug
+    <a id="project-torbutton"></a>
+    <h3><a href="<page torbutton/index>">Torbutton</a> (<a
+    href="https://gitweb.torproject.org/torbutton.git">code</a>, <a
+    href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Torbutton&order=priority">bug
     tracker</a>)</h3>
 
     <p>
-    Utility for adapting other applications to work with Tor. Development has
-    slowed and compatibility issues remain with some platforms, but it's
-    otherwise feature complete.
-    </p>
-    
-    <!--
-    <p>
-    <b>Project Ideas:</b><br />
-    <i><a href="#torsocksForOSX">Make torsocks/dsocks work on OS X</a></i>
+    Firefox addon that addresses many of the client-side threats to browsing
+    the Internet anonymously. Mike has since continued to adapt it to new
+    threats, updated versions of Firefox, and possibly <a
+    href="https://blog.torproject.org/blog/google-chrome-incognito-mode-tor-and-fingerprinting">Chrome
+    as well</a>.
     </p>
-    -->
 
-    <a id="project-torouter"></a>
-    <h3><a
-    href="<wiki>doc/Torouter">Torouter</a> (<a
-    href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Torouter&order=priority">bug
+    <a id="project-httpseverywhere"></a>
+    <h3><a href="https://www.eff.org/https-everywhere">HTTPS Everywhere</a> (<a
+    href="https://gitweb.torproject.org/https-everywhere.git">code</a>, <a
+    href="https://trac.torproject.org/projects/tor/report/19">bug
     tracker</a>)</h3>
 
     <p>
-    Project to provide an easy-to-use, embedded Tor instance for routers. This
-    had high activity in late 2010, but has since been rather quiet.
+    HTTPS Everywhere is a Firefox and Chrome extension that encrypts
+    your communications with many major websites, making your browsing
+    more secure.
     </p>
 
     <a id="project-vidalia"></a>
@@ -488,8 +560,8 @@ meetings around the world.</li>
     <p>
     The most commonly used user interface for Tor. Matt Edman started the
     project in 2006 and brought it to its current stable state. Development
-    slowed for several years, though Tomás Touceda has since taken a lead with
-    pushing the project forward.
+    slowed for several years, though Tomás Touceda has since taken the
+    lead with pushing the project forward.
     </p>
 
     <!--
@@ -540,20 +612,78 @@ meetings around the world.</li>
     </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
-    href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Torbutton&order=priority">bug
+    <a id="project-tails"></a>
+    <h3><a href="https://tails.boum.org/">The Amnesic Incognito Live System</a> (<a
+    href="http://git.immerda.ch/?p=amnesia.git;a=summary">code</a>, <a
+    href="https://tails.boum.org/bugs/">bug
     tracker</a>)</h3>
 
     <p>
-    Firefox addon that addresses many of the client-side threats to browsing
-    the Internet anonymously. Mike has since continued to adapt it to new
-    threats, updated versions of Firefox, and possibly <a
-    href="https://blog.torproject.org/blog/google-chrome-incognito-mode-tor-and-fingerprinting">Chrome
-    as well</a>.
+    The Amnesic Incognito Live System is a live CD/USB distribution
+    preconfigured so that everything is safely routed through Tor and leaves no
+    trace on the local system. This is a merger of the Amnesia and <a
+    href="http://www.anonymityanywhere.com/incognito/">Incognito</a> projects,
+    and still under very active development.
+    </p>
+
+    <!--
+    <p>
+    <b>Project Ideas:</b><br />
+    <i><a href="#tailsHiddenServicePetnames">Petname system for Tor hidden
+    services</a></i><br />
+    <i><a href="#tailsServer">Tails server: Self-hosted services behind
+    Tails-powered Tor hidden services</a></i>
+    </p>
+    -->
+
+    <a id="project-torramdisk"></a>
+    <h3><a href="http://opensource.dyc.edu/tor-ramdisk">Tor-ramdisk</a> (<a
+    href="">code</a>, <a
+    href="">bug tracker</a>)</h3>
+
+    <p>
+    tor-ramdisk
+    </p>
+
+    <a id="project-torcloud"></a>
+    <h3><a href="https://cloud.torproject.org/">Tor cloud</a> (<a
+    href="">code</a>, <a
+    href="">bug tracker</a>)</h3>
+
+    <p>
+    Tor cloud
+    </p>
+
+    <a id="project-torouter"></a>
+    <h3><a
+    href="<wiki>doc/Torouter">Torouter</a> (<a
+    href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Torouter&order=priority">bug
+    tracker</a>)</h3>
+
+    <p>
+    Project to provide an easy-to-use, embedded Tor instance for routers. This
+    had high activity in late 2010, but has since been rather quiet.
     </p>
 
+    <a id="project-torsocks"></a>
+    <h3><a href="http://code.google.com/p/torsocks/">Torsocks</a> (<a
+    href="https://gitweb.torproject.org/torsocks.git">code</a>, <a
+    href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Torify&order=priority">bug
+    tracker</a>)</h3>
+
+    <p>
+    Utility for adapting other applications to work with Tor. Development has
+    slowed and compatibility issues remain with some platforms, but it's
+    otherwise feature complete.
+    </p>
+
+    <!--
+    <p>
+    <b>Project Ideas:</b><br />
+    <i><a href="#torsocksForOSX">Make torsocks/dsocks work on OS X</a></i>
+    </p>
+    -->
+
     <a id="project-torbirdy"></a>
     <h3>TorBirdy (<a
     href="https://github.com/ioerror/torbirdy">code</a>, <a
@@ -589,6 +719,17 @@ meetings around the world.</li>
     </p>
     -->
 
+    <a id="project-pyobfsproxy"></a>
+    <h3><a href="<page projects/obfsproxy>">PyObfsproxy</a> (<a
+    href="https://gitweb.torproject.org/user/asn/pyobfsproxy.git">code</a>, <a
+    href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Pluggable+transport&order=priority">bug
+    tracker</a>)</h3>
+
+    <p>
+    PyObfsproxy is a Python reimplementation of Obfsproxy, with the goal of
+    improving its agility in responding to new censor actions.
+    </p>
+
     <a id="project-flash-proxy"></a>
     <h3><a href="https://crypto.stanford.edu/flashproxy/">Flash Proxy</a> (<a
     href="https://gitweb.torproject.org/flashproxy.git">code</a>, <a
@@ -600,6 +741,16 @@ meetings around the world.</li>
     address-based blocking.
     </p>
 
+    <a id="project-brdgrd"></a>
+    <h3><a href="https://gitweb.torproject.org/brdgrd.git/blob/HEAD:/README">Flash Proxy</a> (<a
+    href="https://gitweb.torproject.org/brdgrd.git/tree">code</a>)</h3>
+
+    <p>
+    brgbrd ("bridge guard") is a simple script that can be run on a
+    Tor bridge to induce the Tor clients connecting to it to be less
+    blockable.
+    </p>
+
     <a id="project-thandy"></a>
     <h3>Thandy (<a
     href="https://gitweb.torproject.org/thandy.git">code</a>)</h3>
@@ -610,17 +761,6 @@ meetings around the world.</li>
     its design (including the language it'll be in) are currently in flux.
     </p>
 
-    <a id="project-ooni-probe"></a>
-    <h3>Ooni Probe (<a
-    href="https://gitweb.torproject.org/ooni-probe.git">code</a>, <a
-    href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Ooni&order=priority">bug
-    tracker</a>)</h3>
-    
-    <p>
-    Censorship scanner, checking your local connection for blocked or modified
-    content.
-    </p>
-    
     <a id="project-shadow"></a>
     <h3><a href="https://shadow.cs.umn.edu/">Shadow</a> (<a
     href="https://github.com/shadow">code</a>, <a
@@ -633,15 +773,24 @@ meetings around the world.</li>
     accurate, efficient, controlled, and repeatable Tor experimentation.
     </p>
 
-    <a id="project-torctl"></a>
-    <h3>TorCtl (<a
-    href="https://gitweb.torproject.org/pytorctl.git">code</a>, <a
-    href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Torctl&order=priority">bug
+    <a id="project-experimentor"></a>
+    <h3><a href="">ExperimenTor</a> (<a
+    href="">code</a>, <a
+    href="">bug
     tracker</a>)</h3>
 
     <p>
-    Python bindings and utilities for using the Tor control port. It has been
-    stable for several years, with only minor revisions.
+    ExperimenTor
+    </p>
+
+    <a id="project-chutney"></a>
+    <h3><a href="">Chutney</a> (<a
+    href="">code</a>, <a
+    href="">bug
+    tracker</a>)</h3>
+
+    <p>
+    Chutney
     </p>
 
     <a id="project-stem"></a>
@@ -671,6 +820,17 @@ meetings around the world.</li>
     Used by OONI and APAF.
     </p>
 
+    <a id="project-torctl"></a>
+    <h3>TorCtl (<a
+    href="https://gitweb.torproject.org/pytorctl.git">code</a>, <a
+    href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Torctl&order=priority">bug
+    tracker</a>)</h3>
+
+    <p>
+    Python bindings and utilities for using the Tor control port. It has been
+    stable for several years, with only minor revisions.
+    </p>
+
     <a id="project-tlsdate"></a>
     <h3>Tlsdate (<a href="https://github.com/ioerror/tlsdate">code</a>)</h3>
 
@@ -744,6 +904,27 @@ meetings around the world.</li>
     <i><a href="#compassRefactoring">Compass Refactoring</a></i>
     </p>
 
+    <a id="project-torperf"></a>
+    <h3><a href="">Torperf</a> (<a
+    href="">code</a>, <a
+    href="">bug
+    tracker</a>)</h3>
+
+    <p>
+    TorPerf
+    </p>
+
+    <a id="project-onionoo"></a>
+    <h3><a href="<page projects/onionoo>">Onionoo</a> (<a
+    href="https://gitweb.torproject.org/onionoo.git">java codebase</a>, <a
+    href="https://gitweb.torproject.org/pyonionoo.git">python
+    codebase</a>)</h3>
+
+    <p>
+    Onionoo is a JSON based protocol to learn information about currently
+    running Tor relays and bridges.
+    </p>
+
     <a id="project-weather"></a>
     <h3><a href="https://trac.torproject.org/projects/tor/wiki/org/roadmaps/Weather">Weather</a> (<a
     href="https://gitweb.torproject.org/weather.git">code</a>, <a
@@ -779,17 +960,6 @@ meetings around the world.</li>
     This has been relatively unchanged for quite a while.
     </p>
 
-    <a id="project-onionoo"></a>
-    <h3><a href="<page projects/onionoo>">Onionoo</a> (<a
-    href="https://gitweb.torproject.org/onionoo.git">java codebase</a>, <a
-    href="https://gitweb.torproject.org/pyonionoo.git">python
-    codebase</a>)</h3>
-    
-    <p>
-    Onionoo is a JSON based protocol to learn information about currently
-    running Tor relays and bridges.
-    </p>
-    
     <a id="project-bridgedb"></a>
     <h3><a href="https://trac.torproject.org/projects/tor/wiki/org/roadmaps/BridgeDB">BridgeDB</a> (<a
     href="https://gitweb.torproject.org/bridgedb.git">code</a>, <a
@@ -801,6 +971,17 @@ meetings around the world.</li>
     in. This was actively developed until Fall of 2010.
     </p>
 
+    <a id="project-ooni-probe"></a>
+    <h3>Ooni Probe (<a
+    href="https://gitweb.torproject.org/ooni-probe.git">code</a>, <a
+    href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Ooni&order=priority">bug
+    tracker</a>)</h3>
+
+    <p>
+    Censorship scanner, checking your local connection for blocked or modified
+    content.
+    </p>
+
     <a id="project-torflow"></a>
     <h3><a href="https://trac.torproject.org/projects/tor/wiki/org/roadmaps/TorFlow">TorFlow</a> (<a
     href="https://gitweb.torproject.org/torflow.git">code</a>, <a
@@ -831,6 +1012,27 @@ meetings around the world.</li>
     been inactive.
     </p>
 
+    <a id="project-tor2web"></a>
+    <h3><a
+    href="http://wiki.tor2web.org/index.php/Main_Page">Tor2web</a> (<a
+    href="https://github.com/globaleaks/tor2web-3.0/wiki">code</a>)</h3>
+
+    <p>
+    Tor2web allows Internet users to browse websites running in <a
+    href="<page docs/hidden-services>">Tor hidden services</a>. It trades
+    user anonymity for usability by allowing anonymous content to be
+    distributed to non-anonymous users.
+    </p>
+
+    <a id="project-anonbib"></a>
+    <h3><a
+    href="http://freehaven.net/anonbib/">Anonymity Bibliography</a> (<a
+    href="https://gitweb.torproject.org/anonbib.git">code</a>)</h3>
+
+    <p>
+    anonbib
+    </p>
+
     <a id="Coding"></a>
     <a id="Summer"></a>
     <h2><a class="anchor" href="#Coding">Project Ideas</a></h2>
@@ -1112,7 +1314,7 @@ meetings around the world.</li>
     </li>
     -->
 
-    <a id="httpsImersonation"></a>
+    <a id="httpsImpersonation"></a>
     <li>
     <b>HTTPS Server Impersonation</b>
     <br>

tor-webwml.git
