[or-cvs] stop advertising the blackhat/defcon slides. use the 21c3 s...

[arma@xxxxxxxx (Roger Dingledine)]

Update of /home2/or/cvsroot/website
In directory moria.mit.edu:/home2/arma/work/onion/cvs/website

Modified Files:
	documentation.html howitworks.html 
Log Message:
stop advertising the blackhat/defcon slides. use the 21c3 slides
instead.


Index: documentation.html
===================================================================
RCS file: /home2/or/cvsroot/website/documentation.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- documentation.html	4 Jan 2005 22:45:44 -0000	1.17
+++ documentation.html	18 Jan 2005 02:09:52 -0000	1.18
@@ -71,13 +71,11 @@
 <li><a href="cvs/tor/doc/control-spec.txt">Tor UI control specification</a></li>
 </ul>
 
-<p>Look at the <a href="slides-codecon04/">slides from the Codecon
+<p>Look at the <a href="http://freehaven.net/~arma/21c3-slides.pdf";>slides
+from the 21C3 talk</a>. For something more obsolete,
+look at the <a href="slides-codecon04/">slides from the Codecon
 2004 talk</a>, or <a href="CodeCon_2004-02-21_2.mp3">listen
-to the audio from the talk</a>. You can also peruse the <a
-href="http://freehaven.net/~arma/slides-blackhat04.pdf";>Black
-Hat 2004 slides</a> or <a
-href="http://freehaven.net/~arma/slides-defcon04.pdf";>Defcon 2004
-slides</a>.</p>
+to the audio from the talk</a>.</p>
 
 <p>
 <a href="http://wiki.noreply.org/wiki/TheOnionRouter/TorifyHOWTO";>Guide

Index: howitworks.html
===================================================================
RCS file: /home2/or/cvsroot/website/howitworks.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- howitworks.html	16 Jan 2005 19:08:43 -0000	1.19
+++ howitworks.html	18 Jan 2005 02:09:52 -0000	1.20
@@ -69,13 +69,11 @@
 <li><a href="cvs/tor/doc/control-spec.txt">Tor UI control specification</a></li>
 </ul>
 
-<p>Look at the <a href="slides-codecon04/">slides from the Codecon
+<p>Look at the <a href="http://freehaven.net/~arma/21c3-slides.pdf";>slides
+from the 21C3 talk</a>. For something more obsolete,
+look at the <a href="slides-codecon04/">slides from the Codecon
 2004 talk</a>, or <a href="CodeCon_2004-02-21_2.mp3">listen
-to the audio from the talk</a>. You can also peruse the <a
-href="http://freehaven.net/~arma/slides-blackhat04.pdf";>Black
-Hat 2004 slides</a> or <a
-href="http://freehaven.net/~arma/slides-defcon04.pdf";>Defcon 2004
-slides</a>.</p>
+to the audio from the talk</a>.</p>
 
   </div><!-- #main -->
 </div>