commit bc0196fc250a9db1d2e94d8d7d30b0bbed05c4f0 Author: Damian Johnson atagar@torproject.org Date: Thu Nov 9 09:32:45 2017 -0800
Remove Nicholas Merrill from people page
Oops, I screwed up. During the flurry of adding folks Nicholas and I had a discussion about if he was on tor-internal@ but then I got confused and added him anyway. Oops.
https://trac.torproject.org/projects/tor/ticket/24188 --- about/en/corepeople.wml | 66 +++++++++++++++++---------------------- images/people/nickcalyx.png | Bin 43384 -> 0 bytes images/people/orig/nickcalyx.png | Bin 550678 -> 0 bytes 3 files changed, 28 insertions(+), 38 deletions(-)
diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index 35270cf6..68fb315c 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -557,25 +557,15 @@ table.people tr td:first-child { </td>
<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> - </tr> - - <tr> - <td> <a id="nickhopper"></a> <div class="photo"><img src="$(IMGROOT)/people/nickhopper.png" alt="nickhopper" /></div> <div class="name"><a href="#nickhopper">Nick Hopper</a></div> <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> @@ -585,9 +575,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> @@ -596,7 +584,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> @@ -606,9 +596,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> @@ -616,7 +604,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> @@ -625,9 +615,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> @@ -637,7 +625,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> @@ -645,9 +635,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="ramy"></a> <div class="photo"><img src="$(IMGROOT)/people/ramy.png" alt="ramy" /></div> @@ -656,7 +644,9 @@ table.people tr td:first-child { <div class="name"><a href="#ramy">Ramy Raoof</a></div> <div class="description">Tor Board member, technologist, and privacy and security researcher.</div> </td> + </tr>
+ <tr> <td> <a id="pospeselr"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -666,9 +656,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> pospeselr</div> <div class="description">Tor Browser developer.</div> </td> - </tr>
- <tr> <td> <a id="robgjansen"></a> <div class="photo"><img src="$(IMGROOT)/people/robgjansen.png" alt="robgjansen" /></div> @@ -678,7 +666,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> @@ -688,16 +678,16 @@ 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="sajolida"></a> <div class="photo"><img src="$(IMGROOT)/people/sajolida.png" alt="sajolida" /></div> @@ -705,9 +695,7 @@ table.people tr td:first-child { <div class="name"><a href="#sajolida">sajolida</a></div> <div class="description">Technical writing, UX, and fundraising for Tails.</div> </td> - </tr>
- <tr> <td> <a id="sebastian"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -715,7 +703,9 @@ table.people tr td:first-child { <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> @@ -724,9 +714,7 @@ 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> @@ -736,7 +724,9 @@ 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> @@ -746,9 +736,7 @@ 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> @@ -758,7 +746,9 @@ 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> @@ -768,9 +758,7 @@ table.people tr td:first-child { <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> @@ -780,7 +768,9 @@ 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> @@ -789,9 +779,7 @@ 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> @@ -801,7 +789,9 @@ 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> @@ -810,9 +800,7 @@ 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> @@ -822,7 +810,9 @@ 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> @@ -832,9 +822,7 @@ 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> @@ -844,7 +832,9 @@ 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> diff --git a/images/people/nickcalyx.png b/images/people/nickcalyx.png deleted file mode 100644 index 529d7e88..00000000 Binary files a/images/people/nickcalyx.png and /dev/null differ diff --git a/images/people/orig/nickcalyx.png b/images/people/orig/nickcalyx.png deleted file mode 100644 index ae82f90d..00000000 Binary files a/images/people/orig/nickcalyx.png and /dev/null differ