Browse code

Merge branch 'master' into staging

Sebastian Hahn authored on11/11/2014 05:02:58
Showing2 changed files
... ...
@@ -95,10 +95,6 @@
95 95
           href="https://fteproxy.org/">fteproxy</a>, and part of the
96 96
           pluggable transports team. Grad student at Portland State.</dd>
97 97
 
98
-          <dt>Nima Fatemi, Support, Advocate</dt>
99
-          <dd>Farsi team; helps answer all the users who contact
100
-          the support desk, does training and outreach and works on usability.</dd>
101
-
102 98
           <dt>David Fifield, Developer, Researcher</dt>
103 99
           <dd>Developer and co-inventor of <a
104 100
           href="https://crypto.stanford.edu/flashproxy/">Flash Proxy</a>,
... ...
@@ -1809,7 +1809,7 @@ implementation.
1809 1809
     <br>
1810 1810
     Skill Level: <i>Medium</i>
1811 1811
     <br>
1812
-    Likely Mentors: <i>Sukhbir Singh (sukhe), Nima Fatemi (mrphs)</i>
1812
+    Likely Mentors: <i>Sukhbir Singh (sukhe)</i>
1813 1813
     <p>
1814 1814
 GetTor is a program that serves Tor bundles and related components over SMTP.
1815 1815
 Users request the Tor Browser by sending an email to GetTor, which sends
... ...
@@ -1849,7 +1849,7 @@ is clear that you had some idea of what you were doing, it should be fine)
1849 1849
     </p>
1850 1850
 
1851 1851
     <p>
1852
-Note: Please do not submit an application without talking to the mentors: #sukhe and #mrphs on IRC. IRC is preferred but if for any reason you don't want/can't use it, please email the mentors.
1852
+Note: Please do not submit an application without talking to the mentor: #sukhe on IRC. IRC is preferred but if for any reason you don't want/can't use it, please email the mentors.
1853 1853
     </p>
1854 1854
     </li>
1855 1855