@@ -204,7 +204,7 @@

     </p>

     <ul>

-      <li><h4><a href="https://ahmia.fi/gsoc/">Ahmia.fi - Search Engine for Hidden Services</a> by Juha Nurmi</h4></li>

+      <li><h4><a href="https://ahmia.fi/gsoc/">Ahmia.fi - Search Engine for Onion Services</a> by Juha Nurmi</h4></li>

       <li><h4><a href="http://ilv.github.io/gettor_proposal.html">Revamp GetTor</a> by Israel Leiva</h4></li>

       <li><h4><a href="https://sites.google.com/site/sreenathadev/gsoc-2014-weather-rewrite">Weather Rewrite</a> by Sreenatha Bhatlapenumarthi</h4></li>

       <li><h4><a href="http://kostas.mkj.lt/gsoc2014/gsoc2014.html">BridgeDB Distributor</a> by Kostas Jakeliunas</h4></li>

@@ -17,14 +17,9 @@

     <p>

     The Tor Project, in collaboration with <a href="https://www.eff.org/">The

     Electronic Frontier Foundation</a>, have taken part in Google Summer of Code

-    for 2007 through 2016, mentoring the total of 64 students. We have applied

-    to <a href="https://summerofcode.withgoogle.com/">GSoC 2017</a>, and we

-    should know at the end of February whether we are in this year.

-    <!--

-    Now google has

+    for 2007 through 2016, mentoring the total of 64 students.  Now google has

     announced that we'll be taking part again for <a

     href="https://summerofcode.withgoogle.com/">Google Summer of Code 2017</a>!

-    -->

     </p>

     <p>

@@ -2,14 +2,14 @@

 # Revision: $Revision$

 # Translation-Priority: 4-optional

-#include "head.wmi" TITLE="Tor: Google Summer of Code 2016" CHARSET="UTF-8"

+#include "head.wmi" TITLE="Tor: Google Summer of Code 2017" CHARSET="UTF-8"

 <div id="content" class="clearfix">

   <div id="breadcrumbs">

     <a href="<page index>">Home &raquo; </a>

     <a href="<page about/gsoc>">Google Summer of Code</a>

   </div>

   <div id="maincol"> 

-    <h2>Tor: Google Summer of Code 2016</h2>

+    <h2>Tor: Google Summer of Code 2017</h2>

     <hr>

     <br /><br />

@@ -17,9 +17,14 @@

     <p>

     The Tor Project, in collaboration with <a href="https://www.eff.org/">The

     Electronic Frontier Foundation</a>, have taken part in Google Summer of Code

-    for 2007 through 2014, mentoring the total of 57 students. Now google has

+    for 2007 through 2016, mentoring the total of 64 students. We have applied

+    to <a href="https://summerofcode.withgoogle.com/">GSoC 2017</a>, and we

+    should know at the end of February whether we are in this year.

+    <!--

+    Now google has

     announced that we'll be taking part again for <a

-    href="https://summerofcode.withgoogle.com/">Google Summer of Code 2016</a>!

+    href="https://summerofcode.withgoogle.com/">Google Summer of Code 2017</a>!

+    -->

     </p>

     <p>

@@ -188,17 +193,6 @@

     your mentor.

     </p>

-    <p>

-    If you're interested, you can either contact the <a href="<page

-    about/contact>">tor-assistants list</a> (a private list) with a brief

-    summary of your proposal and we'll give you feedback, or just jump right in

-    and post your ideas and goals to the <a href="<page

-    docs/documentation>#MailingLists">tor-dev mailing list</a> (which is open).

-    Make sure to be responsive during the application selection period; if we

-    like your application but you never answer our mails asking for more

-    information, that's not a good sign.

-    </p>

-    

     <p>

     We're always happy to have new contributors so if you haven't filled up

     your summer plans yet, please consider spending some time working with us

@@ -216,14 +210,11 @@

     <ul>

       <li><h4><a href="https://ahmia.fi/gsoc/">Ahmia.fi - Search Engine for Hidden Services</a> by Juha Nurmi</h4></li>

-      <li><h4><a href="http://www.google-melange.com/gsoc/proposal/public/google/gsoc2014/amoghbl1/5629499534213120">Orbot &amp; Orfox</a> by Amogh Pradeep</h4></li>

       <li><h4><a href="http://ilv.github.io/gettor_proposal.html">Revamp GetTor</a> by Israel Leiva</h4></li>

       <li><h4><a href="https://sites.google.com/site/sreenathadev/gsoc-2014-weather-rewrite">Weather Rewrite</a> by Sreenatha Bhatlapenumarthi</h4></li>

       <li><h4><a href="http://kostas.mkj.lt/gsoc2014/gsoc2014.html">BridgeDB Distributor</a> by Kostas Jakeliunas</h4></li>

       <li><h4><a href="http://kostas.mkj.lt/gsoc2013/gsoc2013.html">Searchable Tor descriptor archive</a> by Kostas Jakeliunas</h4></li>

-      <li><h4><a href="https://www.google-melange.com/gsoc/proposal/review/google/gsoc2013/weltraumpfleger/1">Create an Internet Censorship Virtual Machine Based Simulator</a> by Johannes Fürmann</h4></li>

       <li><h4><a href="../about/gsocProposal/gsoc12-proposal-stemImprovements.html">Stem Improvements and Arm port</a> by Ravi Padmala</h4></li>

-      <li><h4><a href="http://feroze.in/gsoc12.html">Implementing Hidden Service Configuration and Bandwidth Scheduling Plugins</a> by Feroze Naina</h4></li>

       <li><h4><a href="../about/gsocProposal/gsoc10-proposal-soat.txt">SOAT Expansion</a> by John Schanck</h4></li>

       <li><h4><a href="http://inspirated.com/uploads/tor-gsoc-11.pdf">GTK+ Frontend and Client Mode Improvements for arm</a> by Kamran Khan</h4></li>

       <li><h4><a href="http://www.gsathya.in/gsoc11.html">Orbot + ORLib</a> by Sathya Gunasekaran</h4></li>

@@ -17,17 +17,9 @@

     <p>

     The Tor Project, in collaboration with <a href="https://www.eff.org/">The

     Electronic Frontier Foundation</a>, have taken part in Google Summer of Code

-    for 2007 through 2014, mentoring the total of 53 students.

-    In 2015, Tor <a href="https://lists.torproject.org/pipermail/tor-dev/2015-March/008358.html">was not accepted</a> into GSoC (along with many other established organizations). Instead we ran our own program that summer:

-<a href="https://trac.torproject.org/projects/tor/wiki/org/TorSoP">the Summer of Privacy</a>!

-    <!--

-    Now google has

+    for 2007 through 2014, mentoring the total of 57 students. Now google has

     announced that we'll be taking part again for <a

-    href="https://www.google-melange.com/gsoc/homepage/google/gsoc2015">Google

-    Summer of Code 2016</a>!

-    -->

-    We have applied to GSoC 2016, and we should know at the end of February

-    whether we are in this year.

+    href="https://summerofcode.withgoogle.com/">Google Summer of Code 2016</a>!

     </p>

     <p>

@@ -26,6 +26,8 @@

     href="https://www.google-melange.com/gsoc/homepage/google/gsoc2015">Google

     Summer of Code 2016</a>!

     -->

+    We have applied to GSoC 2016, and we should know at the end of February

+    whether we are in this year.

     </p>

     <p>

@@ -2,29 +2,29 @@

 # Revision: $Revision$

 # Translation-Priority: 4-optional

-#include "head.wmi" TITLE="Tor: Google Summer of Code 2015" CHARSET="UTF-8"

+#include "head.wmi" TITLE="Tor: Google Summer of Code 2016" CHARSET="UTF-8"

 <div id="content" class="clearfix">

   <div id="breadcrumbs">

     <a href="<page index>">Home &raquo; </a>

     <a href="<page about/gsoc>">Google Summer of Code</a>

   </div>

   <div id="maincol"> 

-    <h2>Tor: Google Summer of Code 2015</h2>

+    <h2>Tor: Google Summer of Code 2016</h2>

     <hr>

-    <h3>IMPORTANT NOTE: Tor <a href="https://lists.torproject.org/pipermail/tor-dev/2015-March/008358.html">was not accepted</a> into GSoC 2015. Hopefully we'll be back next year, but in the meantime we're running our own program: <a href="https://trac.torproject.org/projects/tor/wiki/org/TorSoP">the Summer of Privacy</a>!</h3>

-

     <br /><br />

     <p>

     The Tor Project, in collaboration with <a href="https://www.eff.org/">The

     Electronic Frontier Foundation</a>, have taken part in Google Summer of Code

     for 2007 through 2014, mentoring the total of 53 students.

+    In 2015, Tor <a href="https://lists.torproject.org/pipermail/tor-dev/2015-March/008358.html">was not accepted</a> into GSoC (along with many other established organizations). Instead we ran our own program that summer:

+<a href="https://trac.torproject.org/projects/tor/wiki/org/TorSoP">the Summer of Privacy</a>!

     <!--

     Now google has

     announced that we'll be taking part again for <a

     href="https://www.google-melange.com/gsoc/homepage/google/gsoc2015">Google

-    Summer of Code 2015</a>!

+    Summer of Code 2016</a>!

     -->

     </p>

@@ -12,7 +12,7 @@

     <h2>Tor: Google Summer of Code 2015</h2>

     <hr>

-    <h3>IMPORTANT NOTE: Tor <a href="https://lists.torproject.org/pipermail/tor-dev/2015-March/008358.html">was not accepted</a> into GSoC 2015, hopefully we'll be back next year!</h3>

+    <h3>IMPORTANT NOTE: Tor <a href="https://lists.torproject.org/pipermail/tor-dev/2015-March/008358.html">was not accepted</a> into GSoC 2015. Hopefully we'll be back next year, but in the meantime we're running our own program: <a href="https://trac.torproject.org/projects/tor/wiki/org/TorSoP">the Summer of Privacy</a>!</h3>

     <br /><br />

@@ -11,7 +11,11 @@

   <div id="maincol"> 

     <h2>Tor: Google Summer of Code 2015</h2>

     <hr>

-    

+

+    <h3>IMPORTANT NOTE: Tor <a href="https://lists.torproject.org/pipermail/tor-dev/2015-March/008358.html">was not accepted</a> into GSoC 2015, hopefully we'll be back next year!</h3>

+

+    <br /><br />

+

     <p>

     The Tor Project, in collaboration with <a href="https://www.eff.org/">The

     Electronic Frontier Foundation</a>, have taken part in Google Summer of Code

@@ -2,23 +2,26 @@

 # Revision: $Revision$

 # Translation-Priority: 4-optional

-#include "head.wmi" TITLE="Tor: Google Summer of Code 2014" CHARSET="UTF-8"

+#include "head.wmi" TITLE="Tor: Google Summer of Code 2015" CHARSET="UTF-8"

 <div id="content" class="clearfix">

   <div id="breadcrumbs">

     <a href="<page index>">Home &raquo; </a>

     <a href="<page about/gsoc>">Google Summer of Code</a>

   </div>

   <div id="maincol"> 

-    <h2>Tor: Google Summer of Code 2014</h2>

+    <h2>Tor: Google Summer of Code 2015</h2>

     <hr>

     <p>

     The Tor Project, in collaboration with <a href="https://www.eff.org/">The

     Electronic Frontier Foundation</a>, have taken part in Google Summer of Code

-    for 2007 through 2013, mentoring the total of 40 students. Now google has

+    for 2007 through 2014, mentoring the total of 53 students.

+    <!--

+    Now google has

     announced that we'll be taking part again for <a

-    href="https://www.google-melange.com/gsoc/homepage/google/gsoc2014">Google

-    Summer of Code 2014</a>!

+    href="https://www.google-melange.com/gsoc/homepage/google/gsoc2015">Google

+    Summer of Code 2015</a>!

+    -->

     </p>

     <p>

@@ -216,7 +216,7 @@

     <ul>

       <li><h4><a href="https://ahmia.fi/gsoc/">Ahmia.fi - Search Engine for Hidden Services</a> by Juha Nurmi</h4></li>

       <li><h4><a href="http://www.google-melange.com/gsoc/proposal/public/google/gsoc2014/amoghbl1/5629499534213120">Orbot &amp; Orfox</a> by Amogh Pradeep</h4></li>

-      <li><h4><a href="http://ileiva.github.io/gettor_proposal.html">Revamp GetTor</a> by Israel Leiva</h4></li>

+      <li><h4><a href="http://ilv.github.io/gettor_proposal.html">Revamp GetTor</a> by Israel Leiva</h4></li>

       <li><h4><a href="https://sites.google.com/site/sreenathadev/gsoc-2014-weather-rewrite">Weather Rewrite</a> by Sreenatha Bhatlapenumarthi</h4></li>

       <li><h4><a href="http://kostas.mkj.lt/gsoc2014/gsoc2014.html">BridgeDB Distributor</a> by Kostas Jakeliunas</h4></li>

       <li><h4><a href="http://kostas.mkj.lt/gsoc2013/gsoc2013.html">Searchable Tor descriptor archive</a> by Kostas Jakeliunas</h4></li>

@@ -217,6 +217,7 @@

       <li><h4><a href="https://ahmia.fi/gsoc/">Ahmia.fi - Search Engine for Hidden Services</a> by Juha Nurmi</h4></li>

       <li><h4><a href="http://www.google-melange.com/gsoc/proposal/public/google/gsoc2014/amoghbl1/5629499534213120">Orbot &amp; Orfox</a> by Amogh Pradeep</h4></li>

       <li><h4><a href="http://ileiva.github.io/gettor_proposal.html">Revamp GetTor</a> by Israel Leiva</h4></li>

+      <li><h4><a href="https://sites.google.com/site/sreenathadev/gsoc-2014-weather-rewrite">Weather Rewrite</a> by Sreenatha Bhatlapenumarthi</h4></li>

       <li><h4><a href="http://kostas.mkj.lt/gsoc2014/gsoc2014.html">BridgeDB Distributor</a> by Kostas Jakeliunas</h4></li>

       <li><h4><a href="http://kostas.mkj.lt/gsoc2013/gsoc2013.html">Searchable Tor descriptor archive</a> by Kostas Jakeliunas</h4></li>

       <li><h4><a href="https://www.google-melange.com/gsoc/proposal/review/google/gsoc2013/weltraumpfleger/1">Create an Internet Censorship Virtual Machine Based Simulator</a> by Johannes Fürmann</h4></li>

@@ -217,6 +217,7 @@

       <li><h4><a href="https://ahmia.fi/gsoc/">Ahmia.fi - Search Engine for Hidden Services</a> by Juha Nurmi</h4></li>

       <li><h4><a href="http://www.google-melange.com/gsoc/proposal/public/google/gsoc2014/amoghbl1/5629499534213120">Orbot &amp; Orfox</a> by Amogh Pradeep</h4></li>

       <li><h4><a href="http://ileiva.github.io/gettor_proposal.html">Revamp GetTor</a> by Israel Leiva</h4></li>

+      <li><h4><a href="http://kostas.mkj.lt/gsoc2014/gsoc2014.html">BridgeDB Distributor</a> by Kostas Jakeliunas</h4></li>

       <li><h4><a href="http://kostas.mkj.lt/gsoc2013/gsoc2013.html">Searchable Tor descriptor archive</a> by Kostas Jakeliunas</h4></li>

       <li><h4><a href="https://www.google-melange.com/gsoc/proposal/review/google/gsoc2013/weltraumpfleger/1">Create an Internet Censorship Virtual Machine Based Simulator</a> by Johannes Fürmann</h4></li>

       <li><h4><a href="../about/gsocProposal/gsoc12-proposal-stemImprovements.html">Stem Improvements and Arm port</a> by Ravi Padmala</h4></li>

@@ -214,6 +214,7 @@

     </p>

     <ul>

+      <li><h4><a href="https://ahmia.fi/gsoc/">Ahmia.fi - Search Engine for Hidden Services</a> by Juha Nurmi</h4></li>

       <li><h4><a href="http://www.google-melange.com/gsoc/proposal/public/google/gsoc2014/amoghbl1/5629499534213120">Orbot &amp; Orfox</a> by Amogh Pradeep</h4></li>

       <li><h4><a href="http://ileiva.github.io/gettor_proposal.html">Revamp GetTor</a> by Israel Leiva</h4></li>

       <li><h4><a href="http://kostas.mkj.lt/gsoc2013/gsoc2013.html">Searchable Tor descriptor archive</a> by Kostas Jakeliunas</h4></li>

@@ -215,6 +215,7 @@

     <ul>

       <li><h4><a href="http://www.google-melange.com/gsoc/proposal/public/google/gsoc2014/amoghbl1/5629499534213120">Orbot &amp; Orfox</a> by Amogh Pradeep</h4></li>

+      <li><h4><a href="http://ileiva.github.io/gettor_proposal.html">Revamp GetTor</a> by Israel Leiva</h4></li>

       <li><h4><a href="http://kostas.mkj.lt/gsoc2013/gsoc2013.html">Searchable Tor descriptor archive</a> by Kostas Jakeliunas</h4></li>

       <li><h4><a href="https://www.google-melange.com/gsoc/proposal/review/google/gsoc2013/weltraumpfleger/1">Create an Internet Censorship Virtual Machine Based Simulator</a> by Johannes Fürmann</h4></li>

       <li><h4><a href="../about/gsocProposal/gsoc12-proposal-stemImprovements.html">Stem Improvements and Arm port</a> by Ravi Padmala</h4></li>

@@ -214,6 +214,7 @@

     </p>

     <ul>

+      <li><h4><a href="http://www.google-melange.com/gsoc/proposal/public/google/gsoc2014/amoghbl1/5629499534213120">Orbot &amp; Orfox</a> by Amogh Pradeep</h4></li>

       <li><h4><a href="http://kostas.mkj.lt/gsoc2013/gsoc2013.html">Searchable Tor descriptor archive</a> by Kostas Jakeliunas</h4></li>

       <li><h4><a href="https://www.google-melange.com/gsoc/proposal/review/google/gsoc2013/weltraumpfleger/1">Create an Internet Censorship Virtual Machine Based Simulator</a> by Johannes Fürmann</h4></li>

       <li><h4><a href="../about/gsocProposal/gsoc12-proposal-stemImprovements.html">Stem Improvements and Arm port</a> by Ravi Padmala</h4></li>

@@ -15,13 +15,10 @@

     <p>

     The Tor Project, in collaboration with <a href="https://www.eff.org/">The

     Electronic Frontier Foundation</a>, have taken part in Google Summer of Code

-    for 2007 through 2013, mentoring the total of 40 students.

-    <!--

-    Now google has

+    for 2007 through 2013, mentoring the total of 40 students. Now google has

     announced that we'll be taking part again for <a

-    href="https://www.google-melange.com/gsoc/homepage/google/gsoc2013">Google

-    Summer of Code 2013</a>!

-    -->

+    href="https://www.google-melange.com/gsoc/homepage/google/gsoc2014">Google

+    Summer of Code 2014</a>!

     </p>

     <p>

@@ -2,23 +2,26 @@

 # Revision: $Revision$

 # Translation-Priority: 4-optional

-#include "head.wmi" TITLE="Tor: Google Summer of Code 2013" CHARSET="UTF-8"

+#include "head.wmi" TITLE="Tor: Google Summer of Code 2014" CHARSET="UTF-8"

 <div id="content" class="clearfix">

   <div id="breadcrumbs">

     <a href="<page index>">Home &raquo; </a>

     <a href="<page about/gsoc>">Google Summer of Code</a>

   </div>

   <div id="maincol"> 

-    <h2>Tor: Google Summer of Code 2013</h2>

+    <h2>Tor: Google Summer of Code 2014</h2>

     <hr>

     <p>

     The Tor Project, in collaboration with <a href="https://www.eff.org/">The

     Electronic Frontier Foundation</a>, have taken part in Google Summer of Code

-    for 2007 through 2012, mentoring the total of 33 students. Now google has

+    for 2007 through 2013, mentoring the total of 40 students.

+    <!--

+    Now google has

     announced that we'll be taking part again for <a

     href="https://www.google-melange.com/gsoc/homepage/google/gsoc2013">Google

     Summer of Code 2013</a>!

+    -->

     </p>

     <p>

@@ -223,7 +223,7 @@

       <li><h4><a href="http://www.gsathya.in/gsoc11.html">Orbot + ORLib</a> by Sathya Gunasekaran</h4></li>

       <li><h4><a href="http://blanu.net/TorSummerOfCodeProposal.pdf">Blocking-resistant Transport Evaluation Framework</a> by Brandon Wiley</h4></li>

       <li><h4><a href="../about/gsocProposal/gsoc11-proposal-metadataToolkit.pdf">Metadata Anonymisation Toolkit</a> by Julien Voisin</h4></li>

-      <li><h4><a href="http://www.atagar.com/misc/gsocBlog09/">Website Pootle Translation</a> by Damian Johnson</h4></li>

+      <li><h4><a href="https://www.atagar.com/misc/gsocBlog09/">Website Pootle Translation</a> by Damian Johnson</h4></li>

     </ul>

   </div>

@@ -214,6 +214,7 @@

     </p>

     <ul>

+      <li><h4><a href="http://kostas.mkj.lt/gsoc2013/gsoc2013.html">Searchable Tor descriptor archive</a> by Kostas Jakeliunas</h4></li>

       <li><h4><a href="https://www.google-melange.com/gsoc/proposal/review/google/gsoc2013/weltraumpfleger/1">Create an Internet Censorship Virtual Machine Based Simulator</a> by Johannes Fürmann</h4></li>

       <li><h4><a href="../about/gsocProposal/gsoc12-proposal-stemImprovements.html">Stem Improvements and Arm port</a> by Ravi Padmala</h4></li>

       <li><h4><a href="http://feroze.in/gsoc12.html">Implementing Hidden Service Configuration and Bandwidth Scheduling Plugins</a> by Feroze Naina</h4></li>

@@ -214,6 +214,7 @@

     </p>

     <ul>

+      <li><h4><a href="https://www.google-melange.com/gsoc/proposal/review/google/gsoc2013/weltraumpfleger/1">Create an Internet Censorship Virtual Machine Based Simulator</a> by Johannes Fürmann</h4></li>

       <li><h4><a href="../about/gsocProposal/gsoc12-proposal-stemImprovements.html">Stem Improvements and Arm port</a> by Ravi Padmala</h4></li>

       <li><h4><a href="http://feroze.in/gsoc12.html">Implementing Hidden Service Configuration and Bandwidth Scheduling Plugins</a> by Feroze Naina</h4></li>

       <li><h4><a href="../about/gsocProposal/gsoc10-proposal-soat.txt">SOAT Expansion</a> by John Schanck</h4></li>

@@ -119,7 +119,11 @@

     parts you expect to be tricky. Your proposal should also try to break

     down the project into tasks of a fairly fine granularity, and convince

     us you have a plan for finishing it. A timeline for what you will be doing

-    throughout the summer is highly recommended.</li>

+    throughout the summer is highly recommended.<br /><br />

+

+    <i>Note that we might share which project ideas have strong applications in

+    order to spread applicants out (it's bad for everyone for several strong

+    applicants to be for the exact same project).</i><br /><br /></li>

     <li>Point us to a code sample: something good and clean to demonstrate

     that you know what you're doing, ideally from an existing project.</li>

@@ -2,7 +2,7 @@

 # Revision: $Revision$

 # Translation-Priority: 4-optional

-#include "head.wmi" TITLE="Tor: Google Summer of Code 2012" CHARSET="UTF-8"

+#include "head.wmi" TITLE="Tor: Google Summer of Code 2013" CHARSET="UTF-8"

 <div id="content" class="clearfix">

   <div id="breadcrumbs">

     <a href="<page index>">Home &raquo; </a>

@@ -12,27 +12,13 @@

     <h2>Tor: Google Summer of Code 2013</h2>

     <hr>

-    <p>

-    <b>If you're interested in participating in Google Summer of Code then

-    please keep in mind that Google has not yet announced the participating

-    organisations, and Tor might not be selected. See the <a

-    href="https://www.google-melange.com/document/show/gsoc_program/google/gsoc2013/help_page#2._What_is_the_program_timeline">timeline</a>

-    for more information.</b>

-    </p>

-

     <p>

     The Tor Project, in collaboration with <a href="https://www.eff.org/">The

     Electronic Frontier Foundation</a>, have taken part in Google Summer of Code

-    for 2007 through 2012, mentoring the total of 33 students. Google has

-    announced that the program's taking place again this year, see <a

-    href="https://www.google-melange.com/gsoc/homepage/google/gsoc2013">their

-    site</a> for a timeline!

-    

-    <!--

-    We have been accepted as a mentoring organization for <a

-    href="https://socghop.appspot.com/gsoc/program/home/google/gsoc2012">Google

-    Summer of Code 2012</a>!

-    -->

+    for 2007 through 2012, mentoring the total of 33 students. Now google has

+    announced that we'll be taking part again for <a

+    href="https://www.google-melange.com/gsoc/homepage/google/gsoc2013">Google

+    Summer of Code 2013</a>!

     </p>

     <p>

@@ -226,7 +226,6 @@

     <ul>

       <li><h4><a href="../about/gsocProposal/gsoc12-proposal-stemImprovements.html">Stem Improvements and Arm port</a> by Ravi Padmala</h4></li>

       <li><h4><a href="http://feroze.in/gsoc12.html">Implementing Hidden Service Configuration and Bandwidth Scheduling Plugins</a> by Feroze Naina</h4></li>

-      <li><h4><a href="http://dustri.org/pub/tails_server.pdf">Tails Server</a> by Julien Voisin</h4></li>

       <li><h4><a href="../about/gsocProposal/gsoc10-proposal-soat.txt">SOAT Expansion</a> by John Schanck</h4></li>

       <li><h4><a href="http://inspirated.com/uploads/tor-gsoc-11.pdf">GTK+ Frontend and Client Mode Improvements for arm</a> by Kamran Khan</h4></li>

       <li><h4><a href="http://www.gsathya.in/gsoc11.html">Orbot + ORLib</a> by Sathya Gunasekaran</h4></li>

@@ -138,7 +138,7 @@

     <li>Point us to a code sample: something good and clean to demonstrate

     that you know what you're doing, ideally from an existing project.</li>

-    <li>Why do you want to work with The Tor Project / EFF in

+    <li>Why do you want to work with The Tor Project in

     particular?</li>

     <li>Tell us about your experiences in free software development

@@ -181,10 +181,9 @@

     <p>

     We mostly pick mentors from the <a href="<page about/corepeople>">core Tor

-    development team</a> and <a href="http://www.eff.org/about/staff">EFF's

-    staff</a> so we should be able to accommodate a wide variety of projects.

-    These can range from work on Tor itself to work on supporting or peripheral

-    projects.

+    development team</a> so we should be able to accommodate a wide variety of

+    projects. These can range from work on Tor itself to work on supporting or

+    peripheral projects.

     </p>

     <p>

@@ -12,6 +12,14 @@

     <h2>Tor: Google Summer of Code 2013</h2>

     <hr>

+    <p>

+    <b>If you're interested in participating in Google Summer of Code then

+    please keep in mind that Google has not yet announced the participating

+    organisations, and Tor might not be selected. See the <a

+    href="https://www.google-melange.com/document/show/gsoc_program/google/gsoc2013/help_page#2._What_is_the_program_timeline">timeline</a>

+    for more information.</b>

+    </p>

+

     <p>

     The Tor Project, in collaboration with <a href="https://www.eff.org/">The

     Electronic Frontier Foundation</a>, have taken part in Google Summer of Code

@@ -9,29 +9,22 @@

     <a href="<page about/gsoc>">Google Summer of Code</a>

   </div>

   <div id="maincol"> 

-    <h2>Tor: Google Summer of Code 2012</h2>

+    <h2>Tor: Google Summer of Code 2013</h2>

     <hr>

     <p>

-    In the last five years, The Tor Project in collaboration with <a

-    href="https://www.eff.org/">The Electronic Frontier Foundation</a>

-    successfully took part in

-    <a href="http://code.google.com/soc/2007/eff/about.html">Google Summer of Code

-    2007</a>, <a href="http://code.google.com/soc/2008/eff/about.html">2008</a>,

-    <a

-    href="http://socghop.appspot.com/gsoc/org/home/google/gsoc2009/eff">2009</a>,

-    <a href="<blog>tor-google-summer-code-2010">2010</a>, and <a

-    href="https://socghop.appspot.com/gsoc/program/home/google/gsoc2011">2011</a>.

-    In total we had 27 students as full-time developers for the summers of 2007 to

-    2011. We have been accepted as a mentoring organization for <a

+    The Tor Project, in collaboration with <a href="https://www.eff.org/">The

+    Electronic Frontier Foundation</a>, have taken part in Google Summer of Code

+    for 2007 through 2012, mentoring the total of 33 students. Google has

+    announced that the program's taking place again this year, see <a

+    href="https://www.google-melange.com/gsoc/homepage/google/gsoc2013">their

+    site</a> for a timeline!

+    

+    <!--

+    We have been accepted as a mentoring organization for <a

     href="https://socghop.appspot.com/gsoc/program/home/google/gsoc2012">Google

     Summer of Code 2012</a>!

-    </p>

-    

-    <p>

-    The <a

-    href="https://google-melange.appspot.com/gsoc/events/google/gsoc2012">timeline</a>

-    for GSoC 2012 is available.

+    -->

     </p>

     <p>

@@ -96,9 +89,7 @@

     <p>

     To start with, please see Tor's <b><a href="<page

     getinvolved/volunteer>#Projects">projects page</a></b> and its following

-    ideas. There are also <b><a

-    href="https://trac.torproject.org/projects/tor/wiki/doc/HTTPSEverywhere/GSOC-2012">projects

-    available</a></b> for the EFF's HTTPS Everywhere plugin.

+    ideas.

     </p>

     <p>

@@ -228,6 +228,7 @@

     <ul>

       <li><h4><a href="../about/gsocProposal/gsoc12-proposal-stemImprovements.html">Stem Improvements and Arm port</a> by Ravi Padmala</h4></li>

       <li><h4><a href="http://feroze.in/gsoc12.html">Implementing Hidden Service Configuration and Bandwidth Scheduling Plugins</a> by Feroze Naina</h4></li>

+      <li><h4><a href="http://dustri.org/pub/tails_server.pdf">Tails Server</a> by Julien Voisin</h4></li>

       <li><h4><a href="../about/gsocProposal/gsoc10-proposal-soat.txt">SOAT Expansion</a> by John Schanck</h4></li>

       <li><h4><a href="http://inspirated.com/uploads/tor-gsoc-11.pdf">GTK+ Frontend and Client Mode Improvements for arm</a> by Kamran Khan</h4></li>

       <li><h4><a href="http://www.gsathya.in/gsoc11.html">Orbot + ORLib</a> by Sathya Gunasekaran</h4></li>

@@ -227,6 +227,7 @@

     <ul>

       <li><h4><a href="../about/gsocProposal/gsoc12-proposal-stemImprovements.html">Stem Improvements and Arm port</a> by Ravi Padmala</h4></li>

+      <li><h4><a href="http://feroze.in/gsoc12.html">Implementing Hidden Service Configuration and Bandwidth Scheduling Plugins</a> by Feroze Naina</h4></li>

       <li><h4><a href="../about/gsocProposal/gsoc10-proposal-soat.txt">SOAT Expansion</a> by John Schanck</h4></li>

       <li><h4><a href="http://inspirated.com/uploads/tor-gsoc-11.pdf">GTK+ Frontend and Client Mode Improvements for arm</a> by Kamran Khan</h4></li>

       <li><h4><a href="http://www.gsathya.in/gsoc11.html">Orbot + ORLib</a> by Sathya Gunasekaran</h4></li>

@@ -226,6 +226,7 @@

     </p>

     <ul>

+      <li><h4><a href="../about/gsocProposal/gsoc12-proposal-stemImprovements.html">Stem Improvements and Arm port</a> by Ravi Padmala</h4></li>

       <li><h4><a href="../about/gsocProposal/gsoc10-proposal-soat.txt">SOAT Expansion</a> by John Schanck</h4></li>

       <li><h4><a href="http://inspirated.com/uploads/tor-gsoc-11.pdf">GTK+ Frontend and Client Mode Improvements for arm</a> by Kamran Khan</h4></li>

       <li><h4><a href="http://www.gsathya.in/gsoc11.html">Orbot + ORLib</a> by Sathya Gunasekaran</h4></li>

@@ -226,8 +226,6 @@

     </p>

     <ul>

-      <li><h4><a href="http://tor.spanning-tree.org/proposal.html">DNSEL Rewrite</a> by Harry Bock</h4></li>

-      <li><h4><a href="http://kjb.homeunix.com/wp-content/uploads/2010/05/KevinBerry-GSoC2010-TorProposal.html">Extending Tor Network Metrics</a> by Kevin Berry</h4></li>

       <li><h4><a href="../about/gsocProposal/gsoc10-proposal-soat.txt">SOAT Expansion</a> by John Schanck</h4></li>

       <li><h4><a href="http://inspirated.com/uploads/tor-gsoc-11.pdf">GTK+ Frontend and Client Mode Improvements for arm</a> by Kamran Khan</h4></li>

       <li><h4><a href="http://www.gsathya.in/gsoc11.html">Orbot + ORLib</a> by Sathya Gunasekaran</h4></li>

@@ -23,9 +23,9 @@

     <a href="<blog>tor-google-summer-code-2010">2010</a>, and <a

     href="https://socghop.appspot.com/gsoc/program/home/google/gsoc2011">2011</a>.

     In total we had 27 students as full-time developers for the summers of 2007 to

-    2011. Now we are applying to <a

+    2011. We have been accepted as a mentoring organization for <a

     href="https://socghop.appspot.com/gsoc/program/home/google/gsoc2012">Google

-    Summer of Code 2012</a>.

+    Summer of Code 2012</a>!

     </p>

     <p>

@@ -2,7 +2,7 @@

 # Revision: $Revision$

 # Translation-Priority: 4-optional

-#include "head.wmi" TITLE="Tor: Google Summer of Code 2011" CHARSET="UTF-8"

+#include "head.wmi" TITLE="Tor: Google Summer of Code 2012" CHARSET="UTF-8"

 <div id="content" class="clearfix">

   <div id="breadcrumbs">

     <a href="<page index>">Home &raquo; </a>

@@ -94,9 +94,11 @@

     <h2><a class="anchor" href="#Ideas">Ideas List</a></h2>

     <p>

-    To start with, please see our <b><a href="<page

+    To start with, please see Tor's <b><a href="<page

     getinvolved/volunteer>#Projects">projects page</a></b> and its following

-    ideas.

+    ideas. There are also <b><a

+    href="https://trac.torproject.org/projects/tor/wiki/doc/HTTPSEverywhere/GSOC-2012">projects

+    available</a></b> for the EFF's HTTPS Everywhere plugin.

     </p>

     <p>

@@ -9,28 +9,29 @@

     <a href="<page about/gsoc>">Google Summer of Code</a>

   </div>

   <div id="maincol"> 

-    <h2>Tor: Google Summer of Code 2011</h2>

+    <h2>Tor: Google Summer of Code 2012</h2>

     <hr>

     <p>

-    In the last four years, The Tor Project in collaboration with <a

+    In the last five years, The Tor Project in collaboration with <a

     href="https://www.eff.org/">The Electronic Frontier Foundation</a>

     successfully took part in

     <a href="http://code.google.com/soc/2007/eff/about.html">Google Summer of Code

     2007</a>, <a href="http://code.google.com/soc/2008/eff/about.html">2008</a>,

     <a

     href="http://socghop.appspot.com/gsoc/org/home/google/gsoc2009/eff">2009</a>,

-    and <a href="<blog>tor-google-summer-code-2010">2010</a>.

-    In total we had 21 students as full-time developers for the summers of 2007 to

-    2010. Now we are applying to <a

-    href="https://socghop.appspot.com/gsoc/program/home/google/gsoc2011">Google

-    Summer of Code 2011</a>.

+    <a href="<blog>tor-google-summer-code-2010">2010</a>, and <a

+    href="https://socghop.appspot.com/gsoc/program/home/google/gsoc2011">2011</a>.

+    In total we had 27 students as full-time developers for the summers of 2007 to

+    2011. Now we are applying to <a

+    href="https://socghop.appspot.com/gsoc/program/home/google/gsoc2012">Google

+    Summer of Code 2012</a>.

     </p>

     <p>

     The <a

-    href="https://socghop.appspot.com/document/show/gsoc_program/google/gsoc2011/timeline">timeline</a>

-    for GSoC 2011 is available.

+    href="https://google-melange.appspot.com/gsoc/events/google/gsoc2012">timeline</a>

+    for GSoC 2012 is available.

     </p>

     <p>

@@ -64,11 +65,11 @@

     <h2><a class="anchor" href="#GettingInvolved">How To Get Involved</a></h2>

     <p>

-    The best way to get involved is to come listen on IRC (both "#tor" and

-    "#tor-dev"), read our docs and other webpages, try out the various tools

-    that are related to the projects that interest you, and ask questions

-    as they come to you: <a href="<page docs/documentation>#UpToSpeed">Getting

-    up to speed</a>.

+    The best way to get involved is to come <a href="<page

+    about/contact>#irc">listen on IRC</a> (both "#tor" and "#tor-dev"), read

+    our docs and other webpages, try out the various tools that are related to

+    the projects that interest you, and ask questions as they come to you: <a

+    href="<page docs/documentation>#UpToSpeed">Getting up to speed</a>.

     </p>

     <p>

@@ -84,7 +85,7 @@

     <p>

     When it comes time for us to choose projects, our impression of how well

-    you'll fit into our community — and how good you are at taking

+    you'll fit into our community — and how well you are at taking

     the initiative to do things — will be at least as important as

     the actual project you'll be working on.

     </p>

@@ -99,19 +100,20 @@

     </p>

     <p>

-    The best kind of ideas are A) ones that we know we need done real soon

-    now (you can get a sense of urgency from the priority on the wishlist,

-    and from talking to the potential mentors), and B) ones where it's

-    clear what needs to be done, at least for the first few steps. Lots of

-    students try to bite off open-ended research topics; but if you're going

-    to be spending the first half of your summer figuring out what exactly

-    you should code, and there's a chance that the conclusion will be "oh,

-    that isn't actually a good idea to build", then your proposal will make

-    us very nervous. Try to figure out how much you can actually fit in a

-    summer, break the work down into manageable pieces, and most importantly,

-    figure out how to make sure your incremental milestones are actually

-    useful — if you don't finish everything in your plan, we want to

-    know that you'll still have produced something useful.

+    The best kind of ideas are well defined and easily broken into subtasks. 

+    A lot of students try to bite off open-ended development and research

+    topics. But if you're going to spend the first half of your summer figuring

+    out what exactly you should code, there's a chance that the conclusion will

+    be "oh, that isn't actually feasible to build after all" and your proposal

+    will make us very nervous.

+    </p>

+    

+    <p>

+    Try to figure out how much you can actually fit in a summer, break the work

+    down into manageable pieces, and most importantly, figure out how to make

+    sure your incremental milestones are actually useful — if you don't

+    finish everything in your plan, we want to know that you'll still have

+    produced something useful.

     </p>

     <a id="Template"></a>

@@ -171,37 +173,45 @@

     helps with the deduplication process and will not impact if we accept your

     application or not.</li>

-    <li>Is there anything else we should know that will make us like your

+    <li>Is there anything else that we should know that will make us like your

     project more?</li>

     </ol>

     <p>

-    We will pick out mentors for this year — most of the

-    people on the <a href="<page about/corepeople>">core Tor development team</a>

-    plus a few people from <a href="http://www.eff.org/about/staff">EFF's staff</a>

-    — so we should be able to accommodate a wide variety of projects,

-    ranging from work on Tor itself to work on supporting or peripheral

-    projects. We can figure out which mentor is appropriate while we're

-    discussing the project you have in mind. We plan to assign a primary

-    mentor to each student, along with one or two assistant mentors to help

-    answer questions and help you integrate with the broader Tor community.

+    We mostly pick mentors from the <a href="<page about/corepeople>">core Tor

+    development team</a> and <a href="http://www.eff.org/about/staff">EFF's

+    staff</a> so we should be able to accommodate a wide variety of projects.

+    These can range from work on Tor itself to work on supporting or peripheral

+    projects.

+    </p>

+    

+    <p>

+    All selected projects are assigned both a primary and assistant mentor to

+    answer your questions and help you integrate with the broader Tor

+    community. Though your mentors are a primary point of contact please use

+    our public spaces (the <a href="<page about/contact>#irc">#tor-dev irc

+    channel</a> and <a href="<page docs/documentation>#MailingLists">tor-dev@

+    email list</a>) to discuss your project. We want you to become a part of

+    the community by the end of the summer, not a stranger that's only known by

+    your mentor.

     </p>

     <p>

     If you're interested, you can either contact the <a href="<page

-    about/contact>">tor-assistants list</a> with a brief summary of your proposal

-    and we'll give you feedback, or just jump right in and post your ideas

-    and goals to the <a href="<page docs/documentation>#MailingLists">tor-talk

-    mailing list</a>. Make sure to be responsive during the application

-    selection period; if we like your application but you never answer our

-    mails asking for more information, that's not a good sign.

+    about/contact>">tor-assistants list</a> (a private list) with a brief

+    summary of your proposal and we'll give you feedback, or just jump right in

+    and post your ideas and goals to the <a href="<page

+    docs/documentation>#MailingLists">tor-dev mailing list</a> (which is open).

+    Make sure to be responsive during the application selection period; if we

+    like your application but you never answer our mails asking for more

+    information, that's not a good sign.

     </p>

     <p>

-    The more applications we get, the more likely Google is to give us good

-    students. So if you haven't filled up your summer plans yet, please

-    consider spending some time working with us to make Tor better!

+    We're always happy to have new contributors so if you haven't filled up

+    your summer plans yet, please consider spending some time working with us

+    to make Tor better!

     </p>

     <a id="Example"></a>

@@ -220,7 +220,7 @@

       <li><h4><a href="http://inspirated.com/uploads/tor-gsoc-11.pdf">GTK+ Frontend and Client Mode Improvements for arm</a> by Kamran Khan</h4></li>

       <li><h4><a href="http://www.gsathya.in/gsoc11.html">Orbot + ORLib</a> by Sathya Gunasekaran</h4></li>

       <li><h4><a href="http://blanu.net/TorSummerOfCodeProposal.pdf">Blocking-resistant Transport Evaluation Framework</a> by Brandon Wiley</h4></li>

-      <li><h4><a href="../about/gsocProposal/gsoc11-proposal-metadataToolkit.txt">Metadata Anonymisation Toolkit</a> by Julien Voisin</h4></li>

+      <li><h4><a href="../about/gsocProposal/gsoc11-proposal-metadataToolkit.pdf">Metadata Anonymisation Toolkit</a> by Julien Voisin</h4></li>

       <li><h4><a href="http://www.atagar.com/misc/gsocBlog09/">Website Pootle Translation</a> by Damian Johnson</h4></li>

     </ul>

@@ -166,6 +166,11 @@

     Interacting with us on IRC will help us get to know you, and help you

     get to know our community.</li>

+    <li>Are you applying to other projects for GSoC and, if so, what would be

+    your preference if you're accepted to both? Having a stated preference

+    helps with the deduplication process and will not impact if we accept your

+    application or not.</li>

+    

     <li>Is there anything else we should know that will make us like your

     project more?</li>

@@ -212,6 +212,10 @@

       <li><h4><a href="http://tor.spanning-tree.org/proposal.html">DNSEL Rewrite</a> by Harry Bock</h4></li>

       <li><h4><a href="http://kjb.homeunix.com/wp-content/uploads/2010/05/KevinBerry-GSoC2010-TorProposal.html">Extending Tor Network Metrics</a> by Kevin Berry</h4></li>

       <li><h4><a href="../about/gsocProposal/gsoc10-proposal-soat.txt">SOAT Expansion</a> by John Schanck</h4></li>

+      <li><h4><a href="http://inspirated.com/uploads/tor-gsoc-11.pdf">GTK+ Frontend and Client Mode Improvements for arm</a> by Kamran Khan</h4></li>

+      <li><h4><a href="http://www.gsathya.in/gsoc11.html">Orbot + ORLib</a> by Sathya Gunasekaran</h4></li>

+      <li><h4><a href="http://blanu.net/TorSummerOfCodeProposal.pdf">Blocking-resistant Transport Evaluation Framework</a> by Brandon Wiley</h4></li>

+      <li><h4><a href="../about/gsocProposal/gsoc11-proposal-metadataToolkit.txt">Metadata Anonymisation Toolkit</a> by Julien Voisin</h4></li>

       <li><h4><a href="http://www.atagar.com/misc/gsocBlog09/">Website Pootle Translation</a> by Damian Johnson</h4></li>

     </ul>

@@ -129,7 +129,8 @@

     descriptions of what you're going to do, with more details about the

     parts you expect to be tricky. Your proposal should also try to break

     down the project into tasks of a fairly fine granularity, and convince

-    us you have a plan for finishing it.</li>

+    us you have a plan for finishing it. A timeline for what you will be doing

+    throughout the summer is highly recommended.</li>

     <li>Point us to a code sample: something good and clean to demonstrate

     that you know what you're doing, ideally from an existing project.</li>

@@ -2,7 +2,7 @@

 # Revision: $Revision$

 # Translation-Priority: 4-optional

-#include "head.wmi" TITLE="Tor: Google Summer of Code 2010" CHARSET="UTF-8"

+#include "head.wmi" TITLE="Tor: Google Summer of Code 2011" CHARSET="UTF-8"

 <div id="content" class="clearfix">

   <div id="breadcrumbs">

     <a href="<page index>">Home &raquo; </a>

@@ -198,6 +198,7 @@

     consider spending some time working with us to make Tor better!

     </p>

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

     <h2><a class="anchor" href="#Example">Application Examples</a></h2>

     <p>

@@ -198,7 +198,7 @@

     consider spending some time working with us to make Tor better!

     </p>

-    <h2><a class="anchor" href="#Template">Application Examples</a></h2>

+    <h2><a class="anchor" href="#Example">Application Examples</a></h2>

     <p>

     Below are examples of some GSoC applications from previous years we liked.