@@ -109,9 +109,9 @@ meetings around the world.</li>

       <tr>

         <td><a href="#project-tor">Tor</a></td>

         <td>Core</td>

-        <td>C</td>

+        <td>C, Rust</td>

         <td>Heavy</td>

-        <td>nickm, athena, arma, dgoulet, asn, teor</td>

+        <td>nickm, arma, dgoulet, asn, teor</td>

       </tr>

       <tr>

@@ -386,7 +386,6 @@ meetings around the world.</li>

     <p>

     <b>Project Ideas:</b><br />

     <i><a href="#metadataremoval">Remove metadata from Tor Browser uploads</a></i><br />

-    <i><a href="#fasterTorBrowser">Make Tor Browser Faster</a></i>

     </p>

     <a id="project-httpseverywhere"></a>

@@ -1022,20 +1021,6 @@ For more information <a href="https://trac.torproject.org/projects/tor/ticket/17

     </p>

     </li>

 -->

-    <a id="fasterTorBrowser"></a>

-    <li>

-    <b>Make Tor Browser Faster</b>

-    <br>

-    Likely Mentors: <i>Tom Ritter (tjr)</i>, <i>Georg (GeKo)</i>, <i>Arthur Edelstein (arthuredelstein)</i>

-    <p>

-    This project will enable and take advantage of HTTP/2, the Alt-Srv

-    header, and tor's new single hop .onion mode to enable websites to

-    transparently move their traffic to a .onion address. In addition to

-    improvements in security, we will benchmark page load and paint times

-    under normal HTTP/1.1, HTTP/2, and when taking advantage of features

-    such as Server Push.

-    </p>

-    </li>

     <a id="ahmiaSearch"></a>

     <li>

@@ -575,7 +575,7 @@ meetings around the world.</li>

     </p>

     <a id="project-onionoo"></a>

-    <h3><a href="https://onionoo.torproject.org/">Onionoo</a> (<a

+    <h3><a href="https://metrics.torproject.org/onionoo.html">Onionoo</a> (<a

     href="https://gitweb.torproject.org/onionoo.git">code</a>,

     <a href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Metrics%2FOnionoo&order=priority">bug tracker</a>)</h3>

@@ -555,7 +555,7 @@ meetings around the world.</li>

     </p>

     <a id="project-atlas"></a>

-    <h3><a href="https://atlas.torproject.org/">Relay Search</a> (<a

+    <h3><a href="https://metrics.torproject.org/rs.html">Relay Search</a> (<a

     href="https://gitweb.torproject.org/atlas.git">code</a>)</h3>

     <p>

@@ -64,7 +64,7 @@ meetings around the world.</li>

     href="https://media.torproject.org/video/">Tor's Media server</a>,

     <a

     href="http://www.howcast.com/videos/90601-How-To-Circumvent-an-Internet-Proxy/">Howcast</a>,

-    and <a href="http://www.youtube.com/c/thetorproject">YouTube</a>.</li>

+    and <a href="https://www.youtube.com/user/TheTorProject">YouTube</a>.</li>

     <li>Create a poster around a theme, such as "Tor for Freedom!"</li>

     <li>Create a t-shirt design that incorporates "<a

     href="https://check.torproject.org/">Congratulations! You are using

@@ -174,7 +174,7 @@ meetings around the world.</li>

         <td><a href="#project-tormessenger">Tor Messenger</a></td>

         <td>Bundle</td>

         <td>JavaScript, XUL, Scripting</td>

-        <td>Heavy</td>

+        <td>None</td>

         <td>arlolra, boklm, sukhe</td>

       </tr>

@@ -358,7 +358,8 @@ meetings around the world.</li>

     <p>

     <b>Project Ideas:</b><br />

-    <i><a href="#improveOnionServices">Help improve Tor onion services</a></i><br />

+  #  <i><a href="#improveOnionServices">Help improve Tor onion services</a></i><br />

+    <i><a href="#pythonTorClient">Python Tor Client</a></i><br />

     <i><a href="#torFuzzing">Fuzzing coverage of Tor</a></i><br />

     <i><a href="#relayCryptoParallelism">Relay crypto parallelism</a></i><br />

     <i><a href="#anonymousLocalCountStatistics">Anonymous local count statistics</a></i><br />

@@ -384,8 +385,7 @@ meetings around the world.</li>

     <p>

     <b>Project Ideas:</b><br />

-    <i><a href="#feedbackExtension">Feedback Extension for Tor Browser</a></i><br />

-    <i><a href="#torBrowserCrashReport">Crash Reporter for Tor Browser</a></i><br />

+    <i><a href="#metadataremoval">Remove metadata from Tor Browser uploads</a></i><br />

     <i><a href="#fasterTorBrowser">Make Tor Browser Faster</a></i>

     </p>

@@ -860,7 +860,7 @@ understand how our mocking system works, and what the challenges are,

 before you apply for this one.

     </p>

     </li>

-<!--

+

     <a id="relayCryptoParallelism"></a>

     <li>

     <b>Relay crypto parallelism</b>

@@ -887,7 +887,7 @@ one.

 For more information <a href="https://trac.torproject.org/projects/tor/ticket/1749">see its ticket</a>.

     </p>

     </li>

+

     <a id="anonymousLocalCountStatistics"></a>

     <li>

     <b>Anonymous local count statistics</b>

@@ -926,7 +926,7 @@ For more information <a href="https://trac.torproject.org/projects/tor/ticket/12

     </p>

     </li>

-<!--

+

 	#Keep old ids in case of incoming links.

     <a id="onionServiceCryptoParallelism"></a><a id="hiddenServiceCryptoParallelism"></a>

     <li>

@@ -971,7 +971,7 @@ this, but it might need some clean-up.

 For more information <a href="https://trac.torproject.org/projects/tor/ticket/7829">see its ticket</a>.

     </p>

     </li>

+

     <a id="improveIpv6Support"></a>

     <li>

     <b>Improve IPv6 support</b>

@@ -771,7 +771,7 @@ meetings around the world.</li>

     <br>

     Language: <i>Python</i>

     <br>

-    Likely Mentors: <i>Damian (atagar), Tim (teor)</i>

+    Likely Mentors: <i>Damian (atagar), teor</i>

     <br><br>

     <p>

 <b><a href="https://stem.torproject.org/">Stem</a></b> is our Python implementation of Tor's varous protocols. Traditionally this included <a href="https://stem.torproject.org/tutorials/the_little_relay_that_could.html">stem.control</a> for Tor's <a href="https://gitweb.torproject.org/torspec.git/tree/control-spec.txt">ControlPort</a> and <a href="https://stem.torproject.org/tutorials/mirror_mirror_on_the_wall.html">stem.descriptor</a> to download from Tor's <a href="https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt">DirPort</a>. But recently we added a third to this family, <b><a href="https://lists.torproject.org/pipermail/tor-dev/2018-February/012905.html">stem.client</a></b>, that speaks Tor's <a href="https://gitweb.torproject.org/torspec.git/tree/tor-spec.txt">ORPort protocol</a>: the relay protocol for usage of the Tor network itself.

@@ -798,7 +798,7 @@ And more! Applicants are encouraged to get a decent understanding of <a href="ht

 <b>As part of applying for this project please get your hands wet with the codebase by contributing some patches for <a href="https://stem.torproject.org/faq.html#how-do-i-get-started">Stem</a>!</b>

     </p>

     </li>

-

+<!--

     <a id="improveOnionServices"></a><a id="improveHiddenServices"></a>

     <li>

     <b>Help improve Tor onion services</b>

@@ -835,7 +835,7 @@ href="https://lists.torproject.org/pipermail/tor-dev/2016-October/011514.html">v

 ideas.

     </p>

     </li>

-

+-->

     <a id="torFuzzing"></a>

     <li>

     <b>Fuzzing coverage of Tor</b>

@@ -860,7 +860,7 @@ understand how our mocking system works, and what the challenges are,

 before you apply for this one.

     </p>

     </li>

-

+<!--

     <a id="relayCryptoParallelism"></a>

     <li>

     <b>Relay crypto parallelism</b>

@@ -887,7 +887,7 @@ one.

 For more information <a href="https://trac.torproject.org/projects/tor/ticket/1749">see its ticket</a>.

     </p>

     </li>

-

+-->

     <a id="anonymousLocalCountStatistics"></a>

     <li>

     <b>Anonymous local count statistics</b>

@@ -911,7 +911,7 @@ For more information <a href="https://trac.torproject.org/projects/tor/ticket/75

     <li>

     <b>Improved SOCKS5 variant</b>

     <br>

-    Likely Mentors: <i>Nick (nickm), David Goulet (dgoulet)</i>

+    Likely Mentors: <i>Nick (nickm), David Goulet (dgoulet), meejah</i>

     <br><br>

     <p>

 In proposal 229, we describe a bunch of additional SOCKS extensions

@@ -926,6 +926,7 @@ For more information <a href="https://trac.torproject.org/projects/tor/ticket/12

     </p>

     </li>

+<!--

 	#Keep old ids in case of incoming links.

     <a id="onionServiceCryptoParallelism"></a><a id="hiddenServiceCryptoParallelism"></a>

     <li>

@@ -970,7 +971,7 @@ this, but it might need some clean-up.

 For more information <a href="https://trac.torproject.org/projects/tor/ticket/7829">see its ticket</a>.

     </p>

     </li>

-

+-->

     <a id="improveIpv6Support"></a>

     <li>

     <b>Improve IPv6 support</b>

@@ -996,7 +997,7 @@ network: are you up for it?

 For more information <a href="https://trac.torproject.org/projects/tor/ticket/17811">see its ticket</a>.

     </p>

     </li>

-

+<!--

     <a id="feedbackExtension"></a>

     <li>

     <b>Feedback Extension for Tor Browser</b>

@@ -1020,36 +1021,12 @@ For more information <a href="https://trac.torproject.org/projects/tor/ticket/17

     feedback process.

     </p>

     </li>

-

-    <a id="torBrowserCrashReport"></a>

-    <li>

-    <b>Crash Reporter for Tor Browser</b>

-    <br>

-    Likely Mentors: <i>Tom Ritter (tjr)</i>, <i>Georg (GeKo)</i>

-    <p>

-    Currently Tor Browser disables the Crash Reporter. We would like to

-    build it reproducible, enable it, and configure it to report crashes

-    containing non-detailed and impersonal information to Tor, on a .onion

-    submission platform that would allow us to view and explore the

-    crashes.

-    </p>

-

-    <p>

-    The project will entail enabling the Crash Report on Tor Browser and

-    creating a backend to receive reports from it. Once created, the crash

-    reporter data will be analyzed and modified to fit Tor's requirements

-    for personal data collection. As time permits, we will update the

-    build system to ensure the crash reporter is built reproducibly and

-    add data analysis tools for the crash report database to visualize top

-    crashers and similar statistics.

-    </p>

-    </li>

-

+-->

     <a id="fasterTorBrowser"></a>

     <li>

     <b>Make Tor Browser Faster</b>

     <br>

-    Likely Mentors: <i>Tom Ritter (tjr)</i>, <i>Georg (GeKo)</i>

+    Likely Mentors: <i>Tom Ritter (tjr)</i>, <i>Georg (GeKo)</i>, <i>Arthur Edelstein (arthuredelstein)</i>

     <p>

     This project will enable and take advantage of HTTP/2, the Alt-Srv

     header, and tor's new single hop .onion mode to enable websites to

@@ -1089,37 +1066,6 @@ For more information <a href="https://trac.torproject.org/projects/tor/ticket/17

     search itself works without client-side JavaScript.

     </p>

-    <p>

-    There are several possible directions for this project, including...

-    </p>

-

-    <ol>

-      <li>Automate blacklisting (very important)<br />

-        <ul>

-          <li>Fetch a list of child abuse media sites</li>

-          <li>Remove these sites from the search results</li>

-        </ul>

-      </li>

-      <li>Add onion services function (very important)<br />

-        <ul>

-          <li>You can add onions using HTML form</li>

-          <li>Call the crawler immidiately when a new site is added</li>

-        </ul>

-      </li>

-      <li>Elasticsearch<br />

-        <ul>

-          <li>Must be updated to 5.X.X sooner or later</li>

-          <li>Adjust the settings</li>

-          <li>Automatically remove data older than, for instance, 90 days</li>

-        </ul>

-      </li>

-      <li>Maintainance<br />

-        <ul>

-          <li>Update all software dependencies</li>

-          <li>Automate crash recovery for Tor, Elasticsearch and crawler</li>

-        </ul>

-      </li>

-    </ol>

     </li>

 <!--

@@ -745,7 +745,8 @@ meetings around the world.</li>

     users around the world. We are looking for a programmer fluent in JS

     and C++ to implement new features to work closely with the Tor Browser

     team.

-

+    </p>

+    <p>

     Image files, especially photos taken by smartphones,

     often carry hidden privacy-violating metadata, typically specified by

     the EXIF format. Such metadata can include the user's geolocation and

@@ -756,10 +757,11 @@ meetings around the world.</li>

     implement this feature for both desktop and mobile Tor Browser. If

     there is time, we can envision sanitizing other kinds of uploaded

     files, including movies, audio, PDFs and Office documents.

-

     </p>

     <p>

     For more information <a href="https://trac.torproject.org/projects/tor/ticket/24965">see its ticket</a>.

+    Please also see <a href="https://mat.boum.org">the Metadata Anonymisation Toolkit (MAT)</a> for a

+    similar project that could serve as inspiration.

     </p>

     </li>

@@ -735,6 +735,34 @@ meetings around the world.</li>

     <ol>

 	#Keep old ids in case of incoming links.

+    <a id="metadataremoval"></a>

+    <li>

+    <b>Remove metadata from Tor Browser uploads</b>

+    <br>

+    Likely Mentors: <i>Arthur D. Edelstein (arthuredelstein)</i>

+    <p>

+    Tor Browser is a privacy-preserving web browser used by millions of

+    users around the world. We are looking for a programmer fluent in JS

+    and C++ to implement new features to work closely with the Tor Browser

+    team.

+

+    Image files, especially photos taken by smartphones,

+    often carry hidden privacy-violating metadata, typically specified by

+    the EXIF format. Such metadata can include the user's geolocation and

+    various unique identifiers. In order to protect the user's identity,

+    we would like the intern to modify the file-upload feature in Tor

+    Browser such that metadata in image files is automatically removed

+    before the image is uploaded to a server. Ideally, the  summer intern would

+    implement this feature for both desktop and mobile Tor Browser. If

+    there is time, we can envision sanitizing other kinds of uploaded

+    files, including movies, audio, PDFs and Office documents.

+

+    </p>

+    <p>

+    For more information <a href="https://trac.torproject.org/projects/tor/ticket/24965">see its ticket</a>.

+    </p>

+    </li>

+

     <a id="pythonTorClient"></a><a id="pythonTorClient"></a>

     <li>

     <b>Python Tor Client</b>

@@ -727,7 +727,7 @@ meetings around the world.</li>

     about/gsoc>">Google Summer of Code</a> or the Tor Summer of Privacy. We have labelled each idea with

     which of our <a href="<page about/corepeople>">core developers</a> would be

     good mentors. If one or more of these ideas looks promising to you, please

-    <a href="<page about/contact>">contact us</a> to discuss your plans rather

+    <a href="mailto:tor-sop@lists.torproject.org">contact us</a>  to discuss your plans rather

     than sending blind applications. You may also want to propose your own

     project idea — which often results in the best applications.

     </p>

@@ -724,7 +724,7 @@ meetings around the world.</li>

     <p>

     You may find some of these projects to be good ideas for <a href="<page

-    about/gsoc>">Google Summer of Code</a>. We have labelled each idea with

+    about/gsoc>">Google Summer of Code</a> or the Tor Summer of Privacy. We have labelled each idea with

     which of our <a href="<page about/corepeople>">core developers</a> would be

     good mentors. If one or more of these ideas looks promising to you, please

     <a href="<page about/contact>">contact us</a> to discuss your plans rather

@@ -757,6 +757,7 @@ This opens interesting opportunities we've never had before such as...

       <li>Download hidden service descriptors. Unlike relays, the descriptors for hidden services are only available over the ORPort. Once <a href="https://trac.torproject.org/projects/tor/ticket/17945">ticket 17945</a> is merged v3 HS descriptor downloads will require a multi-hop circuit. This requires an understanding of Tor's <a href="https://gitweb.torproject.org/torspec.git/tree/rend-spec-v3.txt">hidden service</a> specifications, particularly the HSDir hash ring.</li>

       <li>Authenticate our ORPort connection, checking that ORPorts we connect to have the right key fingerprint.</li>

       <li>Add protocol level integration test of Tor's ORPort, for instance exercising edge cases in circuit construction and extension.</li>

+      <li>Connect to a hidden service to check if it's up or not.</li>

     </ul>

     <p>

@@ -754,6 +754,8 @@ This opens interesting opportunities we've never had before such as...

     <ul>

       <li>Construct a full three-hop circuit that can make GET requests and DNS lookups. If done right this might allow simple usage of the Tor network without even having Tor installed!</li>

       <li>Expand <a href="https://stem.torproject.org/tutorials/mirror_mirror_on_the_wall.html#where-can-i-get-the-current-descriptors">descriptor downloading</a> to use Tor's ORPort as an optional alternative for the DirPort. Following this we could adjust Tor so <a href="https://trac.torproject.org/projects/tor/ticket/19129">Fallback Directories no longer require a DirPort</a>.</li>

+      <li>Download hidden service descriptors. Unlike relays, the descriptors for hidden services are only available over the ORPort. Once <a href="https://trac.torproject.org/projects/tor/ticket/17945">ticket 17945</a> is merged v3 HS descriptor downloads will require a multi-hop circuit. This requires an understanding of Tor's <a href="https://gitweb.torproject.org/torspec.git/tree/rend-spec-v3.txt">hidden service</a> specifications, particularly the HSDir hash ring.</li>

+      <li>Authenticate our ORPort connection, checking that ORPorts we connect to have the right key fingerprint.</li>

       <li>Add protocol level integration test of Tor's ORPort, for instance exercising edge cases in circuit construction and extension.</li>

     </ul>

@@ -519,6 +519,11 @@ meetings around the world.</li>

     Tor.

     </p>

+    <p>

+    <b>Project Ideas:</b><br />

+    <i><a href="#pythonTorClient">Python Tor Client</a></i>

+    </p>

+

     <a id="project-txtorcon"></a>

     <h3><a href="https://txtorcon.readthedocs.io/en/latest/">Txtorcon</a> (<a

     href="https://github.com/meejah/txtorcon">code</a>, <a

@@ -730,6 +735,37 @@ meetings around the world.</li>

     <ol>

 	#Keep old ids in case of incoming links.

+    <a id="pythonTorClient"></a><a id="pythonTorClient"></a>

+    <li>

+    <b>Python Tor Client</b>

+    <br>

+    Language: <i>Python</i>

+    <br>

+    Likely Mentors: <i>Damian (atagar), Tim (teor)</i>

+    <br><br>

+    <p>

+<b><a href="https://stem.torproject.org/">Stem</a></b> is our Python implementation of Tor's varous protocols. Traditionally this included <a href="https://stem.torproject.org/tutorials/the_little_relay_that_could.html">stem.control</a> for Tor's <a href="https://gitweb.torproject.org/torspec.git/tree/control-spec.txt">ControlPort</a> and <a href="https://stem.torproject.org/tutorials/mirror_mirror_on_the_wall.html">stem.descriptor</a> to download from Tor's <a href="https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt">DirPort</a>. But recently we added a third to this family, <b><a href="https://lists.torproject.org/pipermail/tor-dev/2018-February/012905.html">stem.client</a></b>, that speaks Tor's <a href="https://gitweb.torproject.org/torspec.git/tree/tor-spec.txt">ORPort protocol</a>: the relay protocol for usage of the Tor network itself.

+    </p>

+

+    <p>

+This opens interesting opportunities we've never had before such as...

+    </p>

+

+    <ul>

+      <li>Construct a full three-hop circuit that can make GET requests and DNS lookups. If done right this might allow simple usage of the Tor network without even having Tor installed!</li>

+      <li>Expand <a href="https://stem.torproject.org/tutorials/mirror_mirror_on_the_wall.html#where-can-i-get-the-current-descriptors">descriptor downloading</a> to use Tor's ORPort as an optional alternative for the DirPort. Following this we could adjust Tor so <a href="https://trac.torproject.org/projects/tor/ticket/19129">Fallback Directories no longer require a DirPort</a>.</li>

+      <li>Add protocol level integration test of Tor's ORPort, for instance exercising edge cases in circuit construction and extension.</li>

+    </ul>

+

+    <p>

+And more! Applicants are encouraged to get a decent understanding of <a href="https://gitweb.torproject.org/torspec.git/tree/tor-spec.txt">Tor's ORPort protocol</a> and come up with ideas of their own for neat directions that we can take this. To be clear this is <b>not</b> a particularly easy beginner project as it involves expanding stem.client to support more of Tor's ORPort protocol and crypto.

+    </p>

+

+    <p>

+<b>As part of applying for this project please get your hands wet with the codebase by contributing some patches for <a href="https://stem.torproject.org/faq.html#how-do-i-get-started">Stem</a>!</b>

+    </p>

+    </li>

+

     <a id="improveOnionServices"></a><a id="improveHiddenServices"></a>

     <li>

     <b>Help improve Tor onion services</b>

@@ -75,18 +75,6 @@ meetings around the world.</li>

     different languages as conversation starter.</li>

     </ol>

-    <a id="gsoc"></a>

-    <h2><a class="anchor" href="#gsoc">Google Summer of Code</a></h2>

-

-    <p>

-    Tor is also taking part in this year's <a

-    href="https://summerofcode.withgoogle.com/">Google

-    Summer of Code</a>! To apply but you need to be either <a

-    href="https://developers.google.com/open-source/gsoc/faq#what_are_the_eligibility_requirements_for_participation">a

-    present student or just graduated</a>. <b>See our page for <a href="<page

-    about/gsoc>">Google Summer of Code</a> for more information.</b>

-    </p>

-

     <a id="Projects"></a>

     <h2><a class="anchor" href="#Projects">Projects</a></h2>

@@ -247,21 +247,13 @@ meetings around the world.</li>

       </tr>

       <tr>

-        <td><a href="#project-atlas">Atlas</a></td>

+        <td><a href="#project-atlas">Relay Search</a></td>

         <td>Client Service</td>

         <td>JavaScript</td>

         <td>Light</td>

         <td>irl</td>

       </tr>

-      <tr>

-        <td><a href="#project-compass">Compass</a></td>

-        <td>Client Service</td>

-        <td>Python</td>

-        <td>None</td>

-        <td></td>

-      </tr>

-

       <tr>

         <td><a href="#project-onionoo">Onionoo</a></td>

         <td>Backend Service</td>

@@ -570,13 +562,13 @@ meetings around the world.</li>

     </p>

     <a id="project-atlas"></a>

-    <h3><a href="https://atlas.torproject.org/">Atlas</a> (<a

+    <h3><a href="https://atlas.torproject.org/">Relay Search</a> (<a

     href="https://gitweb.torproject.org/atlas.git">code</a>)</h3>

     <p>

-    Atlas is a web application to discover Tor relays and bridges. It provides

-    useful information on how relays are configured along with graphics about

-    their past usage.

+    Relay Search is a web application to discover Tor relays and bridges. It

+    provides useful information on how relays are configured along with graphics

+    about their past usage.

     </p>

     <p>

@@ -589,17 +581,6 @@ meetings around the world.</li>

     been discontinued.

     </p>

-    <a id="project-compass"></a>

-    <h3><a href="https://compass.torproject.org/">Compass</a> (<a

-    href="https://gitweb.torproject.org/compass.git">code</a>, <a

-    href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Metrics%2FCompass&order=priority">bug

-    tracker</a>)</h3>

-

-    <p>

-    Compass is a web and command line application that filters and

-    aggregates the Tor relays based on various attributes.

-    </p>

-

     <a id="project-onionoo"></a>

     <h3><a href="https://onionoo.torproject.org/">Onionoo</a> (<a

     href="https://gitweb.torproject.org/onionoo.git">code</a>,

@@ -539,11 +539,6 @@ meetings around the world.</li>

     Tor.

     </p>

-    <p>

-    <b>Project Ideas:</b><br />

-    <i><a href="#stemDescriptors">Stem Descriptors</a></i>

-    </p>

-

     <a id="project-txtorcon"></a>

     <h3><a href="https://txtorcon.readthedocs.io/en/latest/">Txtorcon</a> (<a

     href="https://github.com/meejah/txtorcon">code</a>, <a

@@ -1027,39 +1022,6 @@ For more information <a href="https://trac.torproject.org/projects/tor/ticket/17

     </p>

     </li>

-    <a id="stemDescriptors"></a>

-    <li>

-    <b>Stem Descriptors</b>

-    <br>

-    Language: <i>Python</i>

-    <br>

-    Likely Mentors: <i>Damian Johnson (atagar), Philipp Winter (phw)</i>

-    <p>

-    <a href="https://stem.torproject.org/">Stem</a> is a Python library for working with tor. With it you can build applications on tor as well as learn information about the relay network. This project concerns this second capability.

-    </p>

-

-    <p>

-    Information about relays are published hourly in documents called <a href="https://stem.torproject.org/tutorials/mirror_mirror_on_the_wall.html">descriptors</a>. With Stem you can download, parse, and validate all kinds of descriptor documents.

-    </p>

-

-    <p>

-    Ideas welcome! You're encouraged to brainstorm improvements we can make to this space but here's a few to get you started...

-    </p>

-

-  <ul>

-    <li><p><b><a href="https://trac.torproject.org/projects/tor/ticket/11045">Validate signatures in the consensus</a></b>. Stem has the ability to validate cryptographic signatures in several descriptor types but not the consensus.</p></li>

-    <li><p><b><a href="https://trac.torproject.org/projects/tor/ticket/21086">Migrate from pycrypto to a supported library</a></b>. Stem presently uses pycrypto for signature validation but it's no longer maintained. We should evaluate options and move to whatever whavever the cool kids are using nowadays.</p></li>

-    <li><p><b><a href="https://trac.torproject.org/projects/tor/ticket/18856">Retrieve descriptors over tor's ORPort</a></b>. Tor relays commonly provide two ports, an <b>ORPort</b> which is used by clients and a <b>DirPort</b> which is obsolete nowadays but in the past was used by tor to download descriptors. Stem still uses tor's DirPort to retrieve descriptors, but it would be neat if we could download from the ORPort instead.</p>

-      <p>This requires implementing part of tor's communication protocol. Depending how complicated this is it might be neat to expand this task to allow the full construction of circuits, allowing client usage of tor without the C executable. Keep in mind though that this later bit hasn't been investigated and might be a pipe dream. ;P</p></li>

-    <li><p><b>Improve performance of reading descriptors</b>. Stem <a href="https://stem.torproject.org/tutorials/mirror_mirror_on_the_wall.html#are-there-any-other-parsing-libraries">isn't the only descriptor parsing library</a> and sadly is the slowest. Tricks like lazy loading have substantially improved our performance but no doubt a dedicated effort to profile Stem would find more low hanging fruit.</p></li>

-  </ul>

-

-

-    <p>

-    <b>As part of applying for this project please get your hands wet with the codebase by contributing some patches for <a href="https://stem.torproject.org/faq.html#how-do-i-get-started">Stem</a>!</b>

-    </p>

-    </li>

-

     <a id="ahmiaSearch"></a>

     <li>

     <b>Ahmia - Onion Service Search</b>

@@ -14,7 +14,7 @@

     <ol>

     <li>Please consider <a href="<page docs/tor-doc-relay>">running

     a relay</a> to help the Tor network grow.</li>

-    <li>Tell your friends! Get them to run relays. Get them to run hidden

+    <li>Tell your friends! Get them to run relays. Get them to run onion

     services. Get them to tell their friends.</li>

     <li>If you like Tor's goals, please <a href="<page donate/donate>">take a moment

     to donate to support further Tor development</a>. We're also looking

@@ -378,12 +378,12 @@ meetings around the world.</li>

     <p>

     <b>Project Ideas:</b><br />

-    <i><a href="#improveHiddenServices">Help improve Tor hidden services</a></i><br />

+    <i><a href="#improveOnionServices">Help improve Tor onion services</a></i><br />

     <i><a href="#torFuzzing">Fuzzing coverage of Tor</a></i><br />

     <i><a href="#relayCryptoParallelism">Relay crypto parallelism</a></i><br />

     <i><a href="#anonymousLocalCountStatistics">Anonymous local count statistics</a></i><br />

     <i><a href="#improveSocks5Variant">Improved SOCKS5 variant</a></i><br />

-    <i><a href="#hiddenServiceCryptoParallelism">Hidden service crypto parallelism</a></i><br />

+    <i><a href="#onionServiceCryptoParallelism">Onion service crypto parallelism</a></i><br />

     <i><a href="#supportAllDNS">Support all kinds of DNS in Tor</a></i><br />

     <i><a href="#improveIpv6Support">Improve IPv6 support</a></i>

     </p>

@@ -765,28 +765,29 @@ meetings around the world.</li>

     <ol>

-    <a id="improveHiddenServices"></a>

+	#Keep old ids in case of incoming links.

+    <a id="improveOnionServices"></a><a id="improveHiddenServices"></a>

     <li>

-    <b>Help improve Tor hidden services</b>

+    <b>Help improve Tor onion services</b>

     <br>

     Language: <i>C</i>

     <br>

     Likely Mentors: <i>George (asn), David Goulet (dgoulet)</i>

     <br><br>

     <p>

-The hidden services team is busy implementing <a

+The onion services team is busy implementing <a

 href="https://gitweb.torproject.org/torspec.git/tree/proposals/224-rend-spec-ng.txt">proposal

-224</a> but we are always open to mentoring fun and exciting hidden

+224</a> but we are always open to mentoring fun and exciting onion

 service projects.

     </p>

     <p>

-In the past, we've mentored a wide variety of projects related to hidden

+In the past, we've mentored a wide variety of projects related to onion

 services, ranging from <a

 href="https://lists.torproject.org/pipermail/tor-dev/2016-April/010832.html">onion

 search engines</a>, <a

 href="https://lists.torproject.org/pipermail/tor-talk/2015-May/037966.html">to

-scaling techniques for hidden services</a>,

+scaling techniques for onion services</a>,

 and also various approaches

 of making onion services more <a

 href="https://lists.torproject.org/pipermail/tor-dev/2012-June/003588.html">usable</a>

@@ -892,24 +893,25 @@ For more information <a href="https://trac.torproject.org/projects/tor/ticket/12

     </p>

     </li>

-    <a id="hiddenServiceCryptoParallelism"></a>

+	#Keep old ids in case of incoming links.

+    <a id="onionServiceCryptoParallelism"></a><a id="hiddenServiceCryptoParallelism"></a>

     <li>

-    <b>Hidden service crypto parallelism</b>

+    <b>Onion service crypto parallelism</b>

     <br>

     Likely Mentors: <i>Nick (nickm), David Goulet (dgoulet)</i>

     <br><br>

     <p>

-Hidden services, hidden service clients, hidden service directories,

+Onion services, onion service clients, onion service directories,

 and introduction points all need to do a few public-key operations as

 they operate.  But right now, these operations are all done on the

 main thread.  It would be good to have these run across multiple cores.

     </p>

     <p>

-This could probably be done in a way similar to how we currently hand

+This could probably be done in a way similar to how we currently handle

 circuit extension handshakes in onion.c and cpuworker.c, but we'd need

-to extend the state machine for hidden services to add an additional

-state.  It could help hidden services operate much more efficiently.

+to extend the state machine for onion services to add an additional

+state.  It could help onion services operate much more efficiently.

     </p>

     <p>

@@ -1060,13 +1062,13 @@ For more information <a href="https://trac.torproject.org/projects/tor/ticket/17

     <a id="ahmiaSearch"></a>

     <li>

-    <b>Ahmia - Hidden Service Search</b>

+    <b>Ahmia - Onion Service Search</b>

     <br>

     Language: <i>Python, Django</i>

     <br>

     Likely Mentors: <i>Juha Nurmi (numes), George (asn)</i>

     <p>

-    Ahmia is open-source search engine software for Tor hidden service deep

+    Ahmia is open-source search engine software for Tor onion service deep

     dark web sites. You can test the running search engine at ahmia.fi. For

     more information see our <a

     href="https://blog.torproject.org/category/tags/ahmiafi">blog post about

@@ -1075,7 +1077,7 @@ For more information <a href="https://trac.torproject.org/projects/tor/ticket/17

     <p>

     Ahmia is a working search engine that indexes, searches, and catalogs

-    content published on Tor Hidden Services. Furthermore, it is an environment

+    content published on Tor Onion Services. Furthermore, it is an environment

     to share meaningful insights, statistics, insights, and news about the Tor

     network itself. In this context, there is a lot of work to do.

     </p>

@@ -1098,7 +1100,7 @@ For more information <a href="https://trac.torproject.org/projects/tor/ticket/17

           <li>Remove these sites from the search results</li>

         </ul>

       </li>

-      <li>Add hidden services funtion (very important)<br />

+      <li>Add onion services function (very important)<br />

         <ul>

           <li>You can add onions using HTML form</li>

           <li>Call the crawler immidiately when a new site is added</li>

@@ -1146,7 +1146,7 @@ For more information <a href="https://trac.torproject.org/projects/tor/ticket/17

     href="/press/presskit/2008-12-19-roadmap-full.pdf">Tor development

     roadmap</a> for more ideas, or just try out Tor and Tor Browser,

     and find out what you think needs fixing.

-    Some of the <a href="<spectree>proposals">current proposals</a>

+    Some of the <a href="<specblob>proposals">current proposals</a>

     might also be short on developers.

     </li>

@@ -55,7 +55,8 @@

     href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays">tor-relays</a>, <a

     href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev">tor-dev</a>, or <a

     href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tbb-dev">tbb-dev</a>,

-    and summarize noteworthy changes into articles for our blog and newsletter.</li>

+    and summarize noteworthy changes into articles for our blog and <a

+    href="https://newsletter.torproject.org/">newsletter</a>.</li>

     <li>Create a presentation that can be used for various user group

 meetings around the world.</li>

     <li>Create a video about the positive uses of Tor, what Tor is,

@@ -55,9 +55,7 @@

     href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays">tor-relays</a>, <a

     href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev">tor-dev</a>, or <a

     href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tbb-dev">tbb-dev</a>,

-    and summarize noteworthy exchanges into articles for <a

-    href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-news">Tor

-    Weekly News</a>.</li>

+    and summarize noteworthy changes into articles for our blog and newsletter.</li>

     <li>Create a presentation that can be used for various user group

 meetings around the world.</li>

     <li>Create a video about the positive uses of Tor, what Tor is,

@@ -423,7 +423,7 @@ meetings around the world.</li>

     </p>

     <a id="project-nyx"></a>

-    <h3><a href="https://www.atagar.com/arm/">Nyx</a> (<a

+    <h3><a href="https://nyx.torproject.org/">Nyx</a> (<a

     href="https://gitweb.torproject.org/nyx.git">code</a>, <a

     href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Core+Tor%2FNyx&order=priority">bug

     tracker</a>)</h3>

@@ -199,14 +199,6 @@ meetings around the world.</li>

         <td>sukhe</td>

       </tr>

-      <tr>

-        <td><a href="#project-flash-proxy">Flash Proxy</a></td>

-        <td>Client Add-on</td>

-        <td>Python, JavaScript, Go</td>

-        <td>Light</td>

-        <td>dcf, infinity0, Arlo Breault</td>

-      </tr>

-

       <tr>

         <td><a href="#project-shadow">Shadow</a></td>

         <td>Simulator</td>

@@ -513,17 +505,6 @@ meetings around the world.</li>

     TorBirdy is Torbutton for Thunderbird and related Mozilla mail clients.

     </p>

-    <a id="project-flash-proxy"></a>

-    <h3><a href="https://crypto.stanford.edu/flashproxy/">Flash Proxy</a> (<a

-    href="https://gitweb.torproject.org/flashproxy.git">code</a>, <a

-    href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Archived%2FFlashproxy&order=priority">bug

-    tracker</a>)</h3>

-

-    <p>

-    Pluggable transport using proxies running in web browsers to defeat

-    address-based blocking.

-    </p>

-

     <a id="project-shadow"></a>

     <h3><a href="http://shadow.github.io/">Shadow</a> (<a

     href="https://github.com/shadow">code</a>, <a

@@ -343,14 +343,6 @@ meetings around the world.</li>

         <td>aagbsn</td>

       </tr>

-      <tr>

-        <td><a href="#project-tor2web">Tor2web</a></td>

-        <td>Client Service</td>

-        <td>Python</td>

-        <td>Heavy</td>

-        <td>evilaliv3, hellais</td>

-      </tr>

-

       <tr>

         <td><a href="#project-collector">CollecTor</a></td>

         <td>Backend Service</td>

@@ -749,18 +741,6 @@ meetings around the world.</li>

     has stopped.

     </p>

-    <a id="project-tor2web"></a>

-    <h3><a

-    href="https://www.tor2web.org">Tor2web</a> (<a

-    href="https://github.com/globaleaks/tor2web-3.0/wiki">code</a>)</h3>

-

-    <p>

-    Tor2web allows Internet users to browse websites running in <a

-    href="<page docs/hidden-services>">Tor hidden services</a>. It trades

-    user anonymity for usability by allowing anonymous content to be

-    distributed to non-anonymous users.

-    </p>

-

     <a id="project-collector"></a>

     <h3><a href="https://collector.torproject.org/">CollecTor</a>

     (<a href="https://gitweb.torproject.org/collector.git">code</a>,

@@ -395,7 +395,14 @@ meetings around the world.</li>

     <p>

     <b>Project Ideas:</b><br />

-    <i><a href="#improveHiddenServices">Help improve Tor hidden services</a></i>

+    <i><a href="#improveHiddenServices">Help improve Tor hidden services</a></i><br />

+    <i><a href="#torFuzzing">Fuzzing coverage of Tor</a></i><br />

+    <i><a href="#relayCryptoParallelism">Relay crypto parallelism</a></i><br />

+    <i><a href="#anonymousLocalCountStatistics">Anonymous local count statistics</a></i><br />

+    <i><a href="#improveSocks5Variant">Improved SOCKS5 variant</a></i><br />

+    <i><a href="#hiddenServiceCryptoParallelism">Hidden service crypto parallelism</a></i><br />

+    <i><a href="#supportAllDNS">Support all kinds of DNS in Tor</a></i><br />

+    <i><a href="#improveIpv6Support">Improve IPv6 support</a></i>

     </p>

     <a id="project-torbrowser"></a>

@@ -835,6 +842,166 @@ ideas.

     </p>

     </li>

+    <a id="torFuzzing"></a>

+    <li>

+    <b>Fuzzing coverage of Tor</b>

+    <br>

+    Likely Mentors: <i>Nick (nickm), ahf, teor</i>

+    <br><br>

+    <p>

+Starting in 0.3.0.x, Tor supports a few fuzzing systems to check our

+code for bugs.  But as of now, we only support a few possible entry

+points to Tor.  It would be great to add fuzzing support for more of

+our codebase -- ideally to include our whole network-facing interface.

+That way, we could find more bugs in our code faster, and fix them

+before they can get out of hand.