===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -r1.357 -r1.358
--- www/events.html	2005/05/04 10:41:42	1.357
+++ www/events.html	2005/05/08 03:02:14	1.358
@@ -26,16 +26,6 @@
 
 <ul>
 
-<li><strong><a name=csw2005></a>
-<a href="http://www.cansecwest.com/">cansecwest/core05</a></strong>,
-May 4-6, 2005, Vancouver, Canada.<br>
-There will be a number of OpenBSD developers in attendance, including
-Theo de Raadt and Ryan McBride. We'll have early access 3.7 CDs to sell, and
-Ryan McBride may be presenting a talk on Network Stack Randomness: how it
-protects against known and unknown attacks, and details of OpenBSDs
-implementation.
-<p>
-
 <li><strong><a name=bsdcan2005></a>
 <a href="http://www.bsdcan.org/2005/">BSDCan 2005</a></strong>,
 May 13 - 14, 2005, Ottawa, Canada.<br>
@@ -73,6 +63,14 @@
 Theo is (very likely) presenting a keynote about what things should be free.
 <p>
 
+<li><strong><a name=recon2005></a>
+<a href="http://www.recon.cx/">REcon 2005</a></strong>,
+June 17 - 19, 2005, Montreal, Canada.<br>
+Ryan McBride will be giving a talk on Network Stack Randomness at this
+security conferenece; expect to find a number of other OpenBSD developers
+in attendance.
+<p>
+
 <li><strong><a name=uofa-cc2005></a> <a
 href="http://www.ualberta.ca/CC2005"> University of Alberta, Campus
 Computing 2005</a></strong>, June 21, 2005, Edmonton, Canada<br> Ryan
@@ -106,6 +104,13 @@
 
 <ul>
 
+<li><strong><a name=csw2005></a>
+<a href="http://www.cansecwest.com/">cansecwest/core05</a></strong>,
+May 4-6, 2005, Vancouver, Canada.<br>
+Hiroaki Etoh spoke about propolice; Theo de Raadt and a number of other
+developers were there to sell CDs and make a nuisance of themselves.
+<p>
+
 <li><strong><a name=ripe50></a>
 <a href="http://www.ripe.net/ripe/meetings/ripe-50/">RIPE 50</a></strong>,
 May 2-6, 2005, Stockholm, Sweden.<br>
@@ -1478,7 +1483,7 @@
 <hr>
 <a href="index.html"><img height=24 width=24 src=back.gif border=0 alt="OpenBSD"></a>
 <a href="mailto:www@openbsd.org">www@openbsd.org</a>
-<br><small>$OpenBSD: events.html,v 1.357 2005/05/04 10:41:42 henning Exp $</small>
+<br><small>$OpenBSD: events.html,v 1.358 2005/05/08 03:02:14 mcbride Exp $</small>
 
 </body>
 </html>