From c3fe45bea32be8067688b0d0a61723167c01f8f0 Mon Sep 17 00:00:00 2001
From: Elana Hashman <ehashman@csclub.uwaterloo.ca>
Date: Mon, 7 Oct 2013 12:43:13 -0400
Subject: [PATCH] Added times and rooms; wrote a news item.

---
 events.xml | 22 +++++++++++-----------
 news.xml   | 21 ++++++++++++++++++++-
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/events.xml b/events.xml
index c71a490..11c85de 100644
--- a/events.xml
+++ b/events.xml
@@ -14,14 +14,14 @@
 </eventitem>
 
 
-<eventitem date="2013-11-12" time="TBD" room="TBD" title="Practical Tor Usage">
+<eventitem date="2013-11-12" time="5:00PM" room="MC 4060" title="Disk Encryption">
   <short><p>
-    The fifth lecture of our security and privacy series. By undergraduate 
-    student Simon Gladstone.
+    The third lecture of our security and privacy series. By MMath alumnus 
+    Zak Blacher. 
   </p></short>
   <abstract><p>
-    The fifth lecture of our security and privacy series. By undergraduate 
-    student Simon Gladstone.
+    The third lecture of our security and privacy series. By MMath alumnus 
+    Zak Blacher. 
   </p></abstract>
 </eventitem>
 
@@ -39,19 +39,19 @@ Seminar on Public Key Cryptography">
 </eventitem>
 
 
-<eventitem date="2013-10-24" time="5:30PM" room="DC 1302" title="Disk Encryption">
+<eventitem date="2013-10-24" time="6:30PM" room="DC 1302" title="Practical Tor Usage">
   <short><p>
-    The third lecture of our security and privacy series. By MMath alumnus 
-    Zak Blacher. 
+    The fifth lecture of our security and privacy series. By undergraduate 
+    student Simon Gladstone.
   </p></short>
   <abstract><p>
-    The third lecture of our security and privacy series. By MMath alumnus 
-    Zak Blacher. 
+    The fifth lecture of our security and privacy series. By undergraduate 
+    student Simon Gladstone.
   </p></abstract>
 </eventitem>
 
 
-<eventitem date="2013-10-15" time="TBD" room="TBD" title="Tunnels and 
+<eventitem date="2013-10-15" time="5:00PM" room="MC 4060" title="Tunnels and 
 Censorship">
   <short><p>
     The second lecture of our security and privacy series. By undergraduate student 
diff --git a/news.xml b/news.xml
index a4ccd9a..71e9857 100644
--- a/news.xml
+++ b/news.xml
@@ -2,7 +2,26 @@
 
 <!DOCTYPE newdefs SYSTEM "csc.dtd" [<!ENTITY mdash "&#x2014;">]>
 <newsdefs>
-  <newsitem author="ehashman" date="2013-10-08">
+  <newsitem author="ehashman" date="2013-10-07">
+    <p>
+      Security and privacy talks all have scheduled times and rooms! Please 
+      note the swap between Zak Blacher's and Simon Gladstone's talk. 
+    </p>
+    <p>
+      The final dates, times, and locations are as follows:
+    </p>
+    <ul>
+      <li>Tuesday, October 8, 5:00PM, MC 4041 &mdash; Sarah Harvey</li>
+      <li>Tuesday, October 15, 5:00PM, MC 4060 &mdash; Eric Dong</li>
+      <li>Thursday, October 24, 6:30PM, DC 1302 &mdash; Simon Gladstone</li>
+      <li>Tuesday, November 5, 6:00PM, MC 3001 (Comfy Lounge) &mdash; Nick 
+        Guenther and Murphy Berzish host a key signing party!</li>
+      <li>Tuesday, November 12, 5:00PM, MC 4060 &mdash; Zak Blacher</li>
+      <li>Tuesday, November 26, 5:00PM, MC 2038 &mdash; Speaker TBD</li>
+    </ul>
+  </newsitem>
+
+  <newsitem author="ehashman" date="2013-10-01">
     <p>
       A number of talks on security and privacy have been planned for this term.
       Email <a href="mailto:progcom@csclub.uwaterloo.ca">progcom</a> if you are