tor-webwml.git

@@ -198,9 +198,12 @@ Perry.</dd>

 projects such as Vidalia, Torbutton and the website.</dd>

 <dt>Christian Schulz, Developer</dt>

-<dd>Developed <a href="http://globe.rndm.de/">Globe</em>, a web application to

+<dd>Developed <a href="http://globe.rndm.de/">Globe</a>, a web application to

 show information about relays that make up the Tor network.</dd>

+<dt>Serene, Developer</dt>

+<dd>Snowflake and Pluggable Transports developer.</dd>

+

 <dt>Andrea Shepard, Developer</dt>

 <dd>Works with Nick as a core Tor developer.</dd>

@@ -729,15 +729,6 @@

   </tr>

   <tr>

-    <td>

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

-      <div class="photo"><img src="$(IMGROOT)/people/serene.png" alt="serene" /></div>

-      <div class="icon"><a href="https://twitter.com/kiserene"><img src="$(IMGROOT)/twitter-small.png" alt="twitter" /></a></div>

-      <div class="icon"><a href="https://db.torproject.org/fetchkey.cgi?fingerprint=28BC839890D4599EC00FD544FB16E10EC13C40E5"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div>

-      <div class="name"><a href="#serene">Serene</a></div>

-      <div class="description">Snowflake and Pluggable Transports developer.</div>

-    </td>

-

     <td>

       <a id="ssteele"></a>

       <div class="photo"><img src="$(IMGROOT)/people/ssteele.png" alt="ssteele" /></div>

@@ -747,9 +738,7 @@

       <div class="field"><b>IRC:</b> ssteele</div>

       <div class="description">Executive Director of the Tor Project, Inc.</div>

     </td>

-  </tr>

-  <tr>

     <td>

       <a id="hiro"></a>

       <div class="photo"><img src="$(IMGROOT)/people/hiro.png" alt="hiro" /></div>

@@ -759,7 +748,9 @@

       <div class="field"><b>IRC:</b> hiro</div>

       <div class="description">Hiro builds and runs Tor Project's web applications and services.</div>

     </td>

+  </tr>

+  <tr>

     <td>

       <a id="inf0"></a>

       <div class="photo"><img src="$(IMGROOT)/people/inf0.png" alt="inf0" /></div>

@@ -769,9 +760,7 @@

       <div class="field"><b>IRC:</b> inf0</div>

       <div class="description">Directory authority operator, outreach and trains human rights activists. System's Engineer at Team Cymru and co-Founder of accessnow.org.</div>

     </td>

-  </tr>

-  <tr>

     <td>

       <a id="stephw"></a>

       <div class="photo"><img src="$(IMGROOT)/people/stephw.png" alt="stephw" /></div>

@@ -781,7 +770,9 @@

       <div class="field"><b>IRC:</b> stephw</div>

       <div class="description">Directs communications.</div>

     </td>

+  </tr>

+  <tr>

     <td>

       <a id="sjmurdoch"></a>

       <div class="photo"><img src="$(IMGROOT)/people/sjmurdoch.png" alt="sjmurdoch" /></div>

@@ -791,9 +782,7 @@

       <div class="field"><b>IRC:</b> sjmurdoch</div>

       <div class="description"><a href="http://www.cs.ucl.ac.uk/staff/s.murdoch/">Principal Research Fellow</a> at University College London and original creator of the <a href="https://www.torproject.org/projects/torbrowser.html.en">Tor Browser</a>.</div>

     </td>

-  </tr>

-  <tr>

     <td>

       <a id="sukhe"></a>

       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>

@@ -802,7 +791,9 @@

       <div class="field"><b>IRC:</b> sukhe</div>

       <div class="description"><a href="https://trac.torproject.org/projects/tor/wiki/torbirdy">TorBirdy</a> and <a href="https://trac.torproject.org/projects/tor/wiki/doc/TorMessenger">Tor Messenger</a> developer. Member of the <a href="https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam">Community Team</a>.</div>

     </td>

+  </tr>

+  <tr>

     <td>

       <a id="haxxpop"></a>

       <div class="photo"><img src="$(IMGROOT)/people/haxxpop.png" alt="haxxpop" /></div>

@@ -812,9 +803,7 @@

       <div class="field"><b>IRC:</b> haxxpop</div>

       <div class="description">Contributes to core Tor and especially onion services.</div>

     </td>

-  </tr>

-  <tr>

     <td>

       <a id="catalyst"></a>

       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>

@@ -824,7 +813,9 @@

       <div class="field"><b>IRC:</b> catalyst</div>

       <div class="description">Software archaeologist and keeper of C language arcana. Works with applied cryptography, protocol design, software security, and technical debt restructuring.</div>

     </td>

+  </tr>

+  <tr>

     <td>

       <a id="teor"></a>

       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>

@@ -833,9 +824,7 @@

       <div class="field"><b>IRC:</b> teor</div>

       <div class="description">Onion services developer, and core member of Tor dev team. Researches Tor network measurement and onion service scalability.</div>

     </td>

-  </tr>

-  <tr>

     <td>

       <a id="tjr"></a>

       <div class="photo"><img src="$(IMGROOT)/people/tjr.png" alt="tjr" /></div>

@@ -845,7 +834,9 @@

       <div class="field"><b>IRC:</b> tjr</div>

       <div class="description">Maintains <a href="https://consensus-health.torproject.org/">Consensus Health </a>, runs one of the bandwidth authorities, and contributes to Tor Browser.</div>

     </td>

+  </tr>

+  <tr>

     <td>

       <a id="t0mmy"></a>

       <div class="photo"><img src="$(IMGROOT)/people/t0mmy.png" alt="t0mmy" /></div>

@@ -855,9 +846,7 @@

       <div class="field"><b>IRC:</b> t0mmy</div>

       <div class="description">Writes and edits grant proposals, one-pagers, blogposts, etc.</div>

     </td>

-  </tr>

-  <tr>

     <td>

       <a id="wseltzer"></a>

       <div class="photo"><img src="$(IMGROOT)/people/wseltzer.png" alt="wseltzer" /></div>

@@ -867,7 +856,9 @@

       <div class="field"><b>IRC:</b> wseltzer</div>

       <div class="description"><a href="https://wendy.seltzer.org/">Techie lawyer</a> and former Tor board member. She works on legal and policy support for private and secure communications.</div>

     </td>

+  </tr>

+  <tr>

     <td>

       <a id="yawning"></a>

       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>