Browse code

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

Damian Johnson authored on09/11/2017 18:32:45
Showing3 changed files
... ...
@@ -556,18 +556,6 @@ table.people tr td:first-child {
556 556
       <div class="description">Founder of the <a href="https://guardianproject.info/">Guardian Project</a>. Orbot lead developer and contributor to Orfox, Onion Browser and NetCipher SDK. Director of Technology at Tibet Action Institute.</div>
557 557
     </td>
558 558
 
559
-    <td>
560
-      <a id="nickcalyx"></a>
561
-      <div class="photo"><img src="$(IMGROOT)/people/nickcalyx.png" alt="nickcalyx" /></div>
562
-      <div class="icon"><a href="https://twitter.com/nickcalyx"><img src="$(IMGROOT)/twitter-small.png" alt="twitter" /></a></div>
563
-      <div class="icon"><a href="https://db.torproject.org/fetchkey.cgi?fingerprint=BC2CB9C4993C086FFDAD8D205905C9C74693488B"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div>
564
-      <div class="name"><a href="#nickcalyx">Nicholas Merrill</a></div>
565
-      <div class="field"><b>IRC:</b> nickcalyx</div>
566
-      <div class="description">Runs a directory authority.</div>
567
-    </td>
568
-  </tr>
569
-
570
-  <tr>
571 559
     <td>
572 560
       <a id="nickhopper"></a>
573 561
       <div class="photo"><img src="$(IMGROOT)/people/nickhopper.png" alt="nickhopper" /></div>
... ...
@@ -575,7 +563,9 @@ table.people tr td:first-child {
575 563
       <div class="field"><b>IRC:</b> nickhopper</div>
576 564
       <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>
577 565
     </td>
566
+  </tr>
578 567
 
568
+  <tr>
579 569
     <td>
580 570
       <a id="nickm"></a>
581 571
       <div class="photo"><img src="$(IMGROOT)/people/nickm.png" alt="nickm" /></div>
... ...
@@ -585,9 +575,7 @@ table.people tr td:first-child {
585 575
       <div class="field"><b>IRC:</b> nickm</div>
586 576
       <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>
587 577
     </td>
588
-  </tr>
589 578
 
590
-  <tr>
591 579
     <td>
592 580
       <a id="boklm"></a>
593 581
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -596,7 +584,9 @@ table.people tr td:first-child {
596 584
       <div class="field"><b>IRC:</b> boklm</div>
597 585
       <div class="description">Works on Tor Browser.</div>
598 586
     </td>
587
+  </tr>
599 588
 
589
+  <tr>
600 590
     <td>
601 591
       <a id="mrphs"></a>
602 592
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -606,9 +596,7 @@ table.people tr td:first-child {
606 596
       <div class="field"><b>IRC:</b> mrphs</div>
607 597
       <div class="description">His main area of interests are End-users Accessibility/Security, UX, Censorship, Advocacy and Onion Services.</div>
608 598
     </td>
609
-  </tr>
610 599
 
611
-  <tr>
612 600
     <td>
613 601
       <a id="syverson"></a>
614 602
       <div class="photo"><img src="$(IMGROOT)/people/syverson.png" alt="syverson" /></div>
... ...
@@ -616,7 +604,9 @@ table.people tr td:first-child {
616 604
       <div class="field"><b>IRC:</b> syverson</div>
617 605
       <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>
618 606
     </td>
607
+  </tr>
619 608
 
609
+  <tr>
620 610
     <td>
621 611
       <a id="pepijn"></a>
622 612
       <div class="photo"><img src="$(IMGROOT)/people/pepijn.png" alt="pepijn" /></div>
... ...
@@ -625,9 +615,7 @@ table.people tr td:first-child {
625 615
       <div class="name"><a href="#pepijn">Pepijn Le Heux</a></div>
626 616
       <div class="description">Lawyer based in The Netherlands and co-founder of Hart voor Internetvrijheid.</div>
627 617
     </td>
628
-  </tr>
629 618
 
630
-  <tr>
631 619
     <td>
632 620
       <a id="phw"></a>
633 621
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -637,7 +625,9 @@ table.people tr td:first-child {
637 625
       <div class="field"><b>IRC:</b> phw</div>
638 626
       <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>
639 627
     </td>
628
+  </tr>
640 629
 
630
+  <tr>
641 631
     <td>
642 632
       <a id="robt"></a>
643 633
       <div class="photo"><img src="$(IMGROOT)/people/robt.png" alt="robt" /></div>
... ...
@@ -645,9 +635,7 @@ table.people tr td:first-child {
645 635
       <div class="name"><a href="#robt">Rabbi Rob Thomas</a></div>
646 636
       <div class="description">CEO of Team Cymru, which supports Tor through hosting, research, and infosec assistance.</div>
647 637
     </td>
648
-  </tr>
649 638
 
650
-  <tr>
651 639
     <td>
652 640
       <a id="ramy"></a>
653 641
       <div class="photo"><img src="$(IMGROOT)/people/ramy.png" alt="ramy" /></div>
... ...
@@ -656,7 +644,9 @@ table.people tr td:first-child {
656 644
       <div class="name"><a href="#ramy">Ramy Raoof</a></div>
657 645
       <div class="description">Tor Board member, technologist, and privacy and security researcher.</div>
658 646
     </td>
647
+  </tr>
659 648
 
649
+  <tr>
660 650
     <td>
661 651
       <a id="pospeselr"></a>
662 652
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -666,9 +656,7 @@ table.people tr td:first-child {
666 656
       <div class="field"><b>IRC:</b> pospeselr</div>
667 657
       <div class="description">Tor Browser developer.</div>
668 658
     </td>
669
-  </tr>
670 659
 
671
-  <tr>
672 660
     <td>
673 661
       <a id="robgjansen"></a>
674 662
       <div class="photo"><img src="$(IMGROOT)/people/robgjansen.png" alt="robgjansen" /></div>
... ...
@@ -678,7 +666,9 @@ table.people tr td:first-child {
678 666
       <div class="field"><b>IRC:</b> robgjansen</div>
679 667
       <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>
680 668
     </td>
669
+  </tr>
681 670
 
671
+  <tr>
682 672
     <td>
683 673
       <a id="arma"></a>
684 674
       <div class="photo"><img src="$(IMGROOT)/people/arma.png" alt="arma" /></div>
... ...
@@ -688,16 +678,16 @@ table.people tr td:first-child {
688 678
       <div class="field"><b>IRC:</b> arma</div>
689 679
       <div class="description">Original developer of Tor along with Nick and Paul. Leading privacy researcher, coordinating developers and researchers.</div>
690 680
     </td>
691
-  </tr>
692 681
 
693
-  <tr>
694 682
     <td>
695 683
       <a id="roya"></a>
696 684
       <div class="photo"><img src="$(IMGROOT)/people/roya.png" alt="roya" /></div>
697 685
       <div class="name"><a href="#roya">Roya Ensafi</a></div>
698 686
       <div class="description">Detects and understands how to manipulate and circumvent Tor network censorship attempts.</div>
699 687
     </td>
688
+  </tr>
700 689
 
690
+  <tr>
701 691
     <td>
702 692
       <a id="sajolida"></a>
703 693
       <div class="photo"><img src="$(IMGROOT)/people/sajolida.png" alt="sajolida" /></div>
... ...
@@ -705,9 +695,7 @@ table.people tr td:first-child {
705 695
       <div class="name"><a href="#sajolida">sajolida</a></div>
706 696
       <div class="description">Technical writing, UX, and fundraising for Tails.</div>
707 697
     </td>
708
-  </tr>
709 698
 
710
-  <tr>
711 699
     <td>
712 700
       <a id="sebastian"></a>
713 701
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -715,7 +703,9 @@ table.people tr td:first-child {
715 703
       <div class="name"><a href="#sebastian">Sebastian Hahn</a></div>
716 704
       <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>
717 705
     </td>
706
+  </tr>
718 707
 
708
+  <tr>
719 709
     <td>
720 710
       <a id="serene"></a>
721 711
       <div class="photo"><img src="$(IMGROOT)/people/serene.png" alt="serene" /></div>
... ...
@@ -724,9 +714,7 @@ table.people tr td:first-child {
724 714
       <div class="name"><a href="#serene">Serene</a></div>
725 715
       <div class="description">Snowflake and Pluggable Transports developer.</div>
726 716
     </td>
727
-  </tr>
728 717
 
729
-  <tr>
730 718
     <td>
731 719
       <a id="ssteele"></a>
732 720
       <div class="photo"><img src="$(IMGROOT)/people/ssteele.png" alt="ssteele" /></div>
... ...
@@ -736,7 +724,9 @@ table.people tr td:first-child {
736 724
       <div class="field"><b>IRC:</b> ssteele</div>
737 725
       <div class="description">Executive Director of the Tor Project, Inc.</div>
738 726
     </td>
727
+  </tr>
739 728
 
729
+  <tr>
740 730
     <td>
741 731
       <a id="hiro"></a>
742 732
       <div class="photo"><img src="$(IMGROOT)/people/hiro.png" alt="hiro" /></div>
... ...
@@ -746,9 +736,7 @@ table.people tr td:first-child {
746 736
       <div class="field"><b>IRC:</b> hiro</div>
747 737
       <div class="description">Hiro builds and runs Tor Project's web applications and services.</div>
748 738
     </td>
749
-  </tr>
750 739
 
751
-  <tr>
752 740
     <td>
753 741
       <a id="inf0"></a>
754 742
       <div class="photo"><img src="$(IMGROOT)/people/inf0.png" alt="inf0" /></div>
... ...
@@ -758,7 +746,9 @@ table.people tr td:first-child {
758 746
       <div class="field"><b>IRC:</b> inf0</div>
759 747
       <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>
760 748
     </td>
749
+  </tr>
761 750
 
751
+  <tr>
762 752
     <td>
763 753
       <a id="stephw"></a>
764 754
       <div class="photo"><img src="$(IMGROOT)/people/stephw.png" alt="stephw" /></div>
... ...
@@ -768,9 +758,7 @@ table.people tr td:first-child {
768 758
       <div class="field"><b>IRC:</b> stephw</div>
769 759
       <div class="description">Directs communications.</div>
770 760
     </td>
771
-  </tr>
772 761
 
773
-  <tr>
774 762
     <td>
775 763
       <a id="sjmurdoch"></a>
776 764
       <div class="photo"><img src="$(IMGROOT)/people/sjmurdoch.png" alt="sjmurdoch" /></div>
... ...
@@ -780,7 +768,9 @@ table.people tr td:first-child {
780 768
       <div class="field"><b>IRC:</b> sjmurdoch</div>
781 769
       <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>
782 770
     </td>
771
+  </tr>
783 772
 
773
+  <tr>
784 774
     <td>
785 775
       <a id="sukhe"></a>
786 776
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -789,9 +779,7 @@ table.people tr td:first-child {
789 779
       <div class="field"><b>IRC:</b> sukhe</div>
790 780
       <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>
791 781
     </td>
792
-  </tr>
793 782
 
794
-  <tr>
795 783
     <td>
796 784
       <a id="catalyst"></a>
797 785
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -801,7 +789,9 @@ table.people tr td:first-child {
801 789
       <div class="field"><b>IRC:</b> catalyst</div>
802 790
       <div class="description">Software archaeologist and keeper of C language arcana. Works with applied cryptography, protocol design, software security, and technical debt restructuring.</div>
803 791
     </td>
792
+  </tr>
804 793
 
794
+  <tr>
805 795
     <td>
806 796
       <a id="teor"></a>
807 797
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -810,9 +800,7 @@ table.people tr td:first-child {
810 800
       <div class="field"><b>IRC:</b> teor</div>
811 801
       <div class="description">Onion services developer, and core member of Tor dev team. Researches Tor network measurement and onion service scalability.</div>
812 802
     </td>
813
-  </tr>
814 803
 
815
-  <tr>
816 804
     <td>
817 805
       <a id="tjr"></a>
818 806
       <div class="photo"><img src="$(IMGROOT)/people/tjr.png" alt="tjr" /></div>
... ...
@@ -822,7 +810,9 @@ table.people tr td:first-child {
822 810
       <div class="field"><b>IRC:</b> tjr</div>
823 811
       <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>
824 812
     </td>
813
+  </tr>
825 814
 
815
+  <tr>
826 816
     <td>
827 817
       <a id="t0mmy"></a>
828 818
       <div class="photo"><img src="$(IMGROOT)/people/t0mmy.png" alt="t0mmy" /></div>
... ...
@@ -832,9 +822,7 @@ table.people tr td:first-child {
832 822
       <div class="field"><b>IRC:</b> t0mmy</div>
833 823
       <div class="description">Writes and edits grant proposals, one-pagers, blogposts, etc.</div>
834 824
     </td>
835
-  </tr>
836 825
 
837
-  <tr>
838 826
     <td>
839 827
       <a id="wseltzer"></a>
840 828
       <div class="photo"><img src="$(IMGROOT)/people/wseltzer.png" alt="wseltzer" /></div>
... ...
@@ -844,7 +832,9 @@ table.people tr td:first-child {
844 832
       <div class="field"><b>IRC:</b> wseltzer</div>
845 833
       <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>
846 834
     </td>
835
+  </tr>
847 836
 
837
+  <tr>
848 838
     <td>
849 839
       <a id="yawning"></a>
850 840
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
851 841
deleted file mode 100644
852 842
Binary files a/images/people/nickcalyx.png and /dev/null differ
853 843
deleted file mode 100644
854 844
Binary files a/images/people/orig/nickcalyx.png and /dev/null differ