[or-cvs] r14305: suggest nick's defcon talk too. (website/trunk/en)

[arma@xxxxxxxx]

Author: arma
Date: 2008-04-06 17:08:04 -0400 (Sun, 06 Apr 2008)
New Revision: 14305

Modified:
   website/trunk/en/documentation.wml
Log:
suggest nick's defcon talk too.


Modified: website/trunk/en/documentation.wml
===================================================================
--- website/trunk/en/documentation.wml	2008-04-06 18:39:04 UTC (rev 14304)
+++ website/trunk/en/documentation.wml	2008-04-06 21:08:04 UTC (rev 14305)
@@ -134,13 +134,17 @@
 </li>
 
 <li>
-Download and watch Roger's "blocking-resistance
+Download and watch Nick's "Technical changes since 2004" talk from
+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="<svnsandbox>doc/design-paper/blocking.html">design paper</a>),
-or Roger's "Current events in Tor development" talk from 24C3 in December
+and 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>,
 <a href="http://freehaven.net/~arma/slides-24c3.pdf";>slides</a>,