@@ -505,6 +505,16 @@ table.people tr td:first-child {

   </tr>

   <tr>

+    <td>

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

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

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

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

+      <div class="name"><a href="#nickcalyx">Nicholas Merrill</a></div>

+      <div class="field"><b>IRC:</b> nickcalyx</div>

+      <div class="description">Runs a directory authority.</div>

+    </td>

+

     <td>

       <a id="nickhopper"></a>

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

@@ -512,7 +522,9 @@ table.people tr td:first-child {

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

       <div class="description"><a href="https://www-users.cs.umn.edu/~hopper/">Researcher</a> interested in improving Tor's performance and resistance to traffic analysis. Some of my work is described <a href="https://www-users.cs.umn.edu/~hopper/research.html">here</a>.</div>

     </td>

+  </tr>

+  <tr>

     <td>

       <a id="nickm"></a>

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

@@ -522,9 +534,7 @@ table.people tr td:first-child {

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

       <div class="description">One of the three original designers of Tor - does a lot of the ongoing design work, and coordinates and leads ongoing development.</div>

     </td>

-  </tr>

-  <tr>

     <td>

       <a id="boklm"></a>

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

@@ -533,7 +543,9 @@ table.people tr td:first-child {

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

       <div class="description">Works on Tor Browser.</div>

     </td>

+  </tr>

+  <tr>

     <td>

       <a id="mrphs"></a>

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

@@ -543,9 +555,7 @@ table.people tr td:first-child {

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

       <div class="description">His main area of interests are End-users Accessibility/Security, UX, Censorship, Advocacy and Onion Services.</div>

     </td>

-  </tr>

-  <tr>

     <td>

       <a id="syverson"></a>

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

@@ -553,7 +563,9 @@ table.people tr td:first-child {

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

       <div class="description"><a href="https://www.nrl.navy.mil">NRL</a> researcher on most things Tor. Inventor of <a href="https://www.onion-router.net/">onion routing</a>, and one of the three original designers of Tor.</div>

     </td>

+  </tr>

+  <tr>

     <td>

       <a id="pepijn"></a>

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

@@ -562,9 +574,7 @@ table.people tr td:first-child {

       <div class="name"><a href="#pepijn">Pepijn Le Heux</a></div>

       <div class="description">Lawyer based in The Netherlands and co-founder of Hart voor Internetvrijheid.</div>

     </td>

-  </tr>

-  <tr>

     <td>

       <a id="phw"></a>

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

@@ -574,7 +584,9 @@ table.people tr td:first-child {

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

       <div class="description">Maintains <a href="https://gitweb.torproject.org/user/phw/exitmap.git/">exitmap</a> and <a href="https://gitweb.torproject.org/user/phw/sybilhunter.git/">sybilhunter</a>, works on <a href="https://trac.torproject.org/projects/tor/wiki/doc/ReportingBadRelays">bad relay detection</a>, and does <a href="https://nymity.ch/papers.html">security and privacy research</a>.</div>

     </td>

+  </tr>

+  <tr>

     <td>

       <a id="robt"></a>

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

@@ -582,9 +594,7 @@ table.people tr td:first-child {

       <div class="name"><a href="#robt">Rabbi Rob Thomas</a></div>

       <div class="description">CEO of Team Cymru, which supports Tor through hosting, research, and infosec assistance.</div>

     </td>

-  </tr>

-  <tr>

     <td>

       <a id="robgjansen"></a>

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

@@ -594,7 +604,9 @@ table.people tr td:first-child {

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

       <div class="description"><a href="https://www.nrl.navy.mil">NRL</a> research scientist, <a href="http://www.robgjansen.com/">leading expert in Tor network performance</a>, and author of <a href="https://shadow.github.io/">Shadow</a>.</div>

     </td>

+  </tr>

+  <tr>

     <td>

       <a id="arma"></a>

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

@@ -604,25 +616,23 @@ table.people tr td:first-child {

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

       <div class="description">Original developer of Tor along with Nick and Paul. Leading privacy researcher, coordinating developers and researchers.</div>

     </td>

-  </tr>

-  <tr>

     <td>

       <a id="roya"></a>

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

       <div class="name"><a href="#roya">Roya Ensafi</a></div>

       <div class="description">Detects and understands how to manipulate and circumvent Tor network censorship attempts.</div>

     </td>

+  </tr>

+  <tr>

     <td>

       <a id="sebastian"></a>

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

       <div class="name"><a href="#sebastian">Sebastian Hahn</a></div>

       <div class="description">Helps people around the world use and understand Tor better. Generally helps everything run smoothly. Runs one of the directory authorities.</div>

     </td>

-  </tr>

-  <tr>

     <td>

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

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

@@ -631,7 +641,9 @@ table.people tr td:first-child {

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

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

     </td>

+  </tr>

+  <tr>

     <td>

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

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

@@ -641,9 +653,7 @@ table.people tr td:first-child {

       <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>

@@ -653,7 +663,9 @@ table.people tr td:first-child {

       <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>

@@ -663,9 +675,7 @@ table.people tr td:first-child {

       <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>

@@ -675,7 +685,9 @@ table.people tr td:first-child {

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

       <div class="description">Directs communications to consistently articulate and promote the Tor Project's mission.</div>

     </td>

+  </tr>

+  <tr>

     <td>

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

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

@@ -685,9 +697,7 @@ table.people tr td:first-child {

       <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>

@@ -696,7 +706,9 @@ table.people tr td:first-child {

       <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. Volunteer on the <a href="https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam">Community Team</a>.</div>

     </td>

+  </tr>

+  <tr>

     <td>

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

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

@@ -706,9 +718,7 @@ table.people tr td:first-child {

       <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>

@@ -717,7 +727,9 @@ table.people tr td:first-child {

       <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>

@@ -727,9 +739,7 @@ table.people tr td:first-child {

       <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>

@@ -738,7 +748,9 @@ table.people tr td:first-child {

       <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>

@@ -748,9 +760,6 @@ table.people tr td:first-child {

       <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>

new file mode 100644

Binary files /dev/null and b/images/people/nickcalyx.png differ

new file mode 100644

Binary files /dev/null and b/images/people/orig/nickcalyx.png differ