commit 08482db4e9dca6742cc5bece3d3ef2415adee393 Author: Erinn Clark erinn@torproject.org Date: Mon Nov 10 22:50:56 2014 -0500

remove mrphs --- about/en/corepeople.wml | 4 ---- getinvolved/en/volunteer.wml | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index 2c6ec68..008feab 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -95,10 +95,6 @@ href="https://fteproxy.org/%22%3Efteproxy</a>, and part of the pluggable transports team. Grad student at Portland State.</dd>

- <dt>Nima Fatemi, Support, Advocate</dt> - <dd>Farsi team; helps answer all the users who contact - the support desk, does training and outreach and works on usability.</dd> - <dt>David Fifield, Developer, Researcher</dt> <dd>Developer and co-inventor of <a href="https://crypto.stanford.edu/flashproxy/">Flash Proxy</a>, diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index 204c635..4b87180 100644 --- a/getinvolved/en/volunteer.wml +++ b/getinvolved/en/volunteer.wml @@ -1809,7 +1809,7 @@ implementation. <br> Skill Level: <i>Medium</i> <br> - Likely Mentors: <i>Sukhbir Singh (sukhe), Nima Fatemi (mrphs)</i> + Likely Mentors: <i>Sukhbir Singh (sukhe)</i> <p> GetTor is a program that serves Tor bundles and related components over SMTP. 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) </p>

<p> -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. +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. </p> </li>