tor-webwml.git

@@ -95,6 +95,24 @@

     how Tor is built.

     </li>

+    <li>

+    Learn about our censorship circumvention side: watch our 28C3

+    talk in December 2011 on how governments have tried to block Tor (<a

+    href="https://media.torproject.org/video/28c3-4800-en-how_governments_have_tried_to_block_tor_h264.mp4">video</a>,

+    <a href="http://www.youtube.com/watch?v=GwMr8Xl7JMQ">youtube</a>, <a

+    href="https://svn.torproject.org/svn/projects/presentations/slides-28c3.pdf">slides</a>),

+    an <a

+    href="https://svn.torproject.org/svn/projects/articles/circumvention-features.html">overview

+    of what to look for in a circumvention tool</a>,

+    and the original "blocking-resistance and

+    circumvention" talk from 23C3 in December 2006 (<a

+    href="http://freehaven.net/~arma/23C3-1444-en-tor_and_china.m4v">video</a>,

+    <a href="http://freehaven.net/~arma/slides-23c3.pdf">slides</a>, <a

+    href="http://events.ccc.de/congress/2006/Fahrplan/events/1444.en.html">abstract</a>,

+    <a href="https://svn.torproject.org/svn/projects/design-paper/blocking.html">design

+    paper</a>).

+    </li>

+

     <li>

     There's a skeletal <a

     href="https://svn.torproject.org/svn/projects/roadmaps/2008-12-19-roadmap-full.pdf">list

@@ -109,12 +127,6 @@

     Defcon in July 2007 (<a

     href="http://freehaven.net/~arma/Defcon15-Mathewson-Technical_Changes_since_you_Last_Heard_about_Tor.mp4">video</a>, <a

     href="http://freehaven.net/~nickm/slides/Defcon07/TorChanges.pdf">slides</a>),

-    Roger's "blocking-resistance

-    and circumvention" talk from 23C3 in December 2006 (<a

-    href="http://freehaven.net/~arma/23C3-1444-en-tor_and_china.m4v">video</a>,

-    <a href="http://freehaven.net/~arma/slides-23c3.pdf">slides</a>,

-    <a href="http://events.ccc.de/congress/2006/Fahrplan/events/1444.en.html">abstract</a>,

-    <a href="https://svn.torproject.org/svn/projects/design-paper/blocking.html">design paper</a>),

     Roger's "Current events in 2007" talk from 24C3 in December

     2007 (<a

     href="http://freehaven.net/~arma/24c3-2325-en-current_events_in_tor_development.mp4">video</a>,