From 33d1075d44a9b386d5cd888ccaf2b7a95ca5dff5 Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Mon, 4 Nov 2013 16:16:59 -0600
Subject: [PATCH] Update changelog

---
 changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/changelog b/changelog
index 27b6631a..0b4eb13b 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+Mon Nov 04 16:15 2013 CDT
+    * lib/xss.js, tests/xss.js: Merge work-in-progress XSS filter
+      from xss branch
+    * lib/torblocker.js: Allow blocking of socket connections from
+      Tor IPs
+
 Thu Oct 31 18:10 2013 CDT
     * package.json: Require node-validator < 2.0.0 as a temporary
       measure while in-house XSS filtering is developed.