torproject/webwml
1
0
Fork 0
mirror of https://github.com/torproject/webwml.git synced 2025-02-07 18:56:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Sebastian Hahn 2014-11-11 05:02:58 +01:00
commit 393bc2fec7
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
about/en/corepeople.wml
View File

@ -95,10 +95,6 @@
href="https://fteproxy.org/">fteproxy</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>,

4
getinvolved/en/volunteer.wml
View File

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