From fe9e7d015e9d0437d0540bda4662af4dbb1a44c3 Mon Sep 17 00:00:00 2001
From: Jon Siwek <jsiwek@illinois.edu>
Date: Mon, 1 Dec 2014 12:10:27 -0600
Subject: [PATCH] Update submodules/changes/version.

---
 CHANGES    | 15 +++++++++++++++
 VERSION    |  2 +-
 aux/broctl |  2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 9d4fae48b1..ce92872eb3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,19 @@
 
+2.3-326 | 2014-12-01 12:10:27 -0600
+
+  * BIFScanner: fix invalid characters in generated preprocessor macros.
+    (Hilko Bengen)
+
+  * BIT-1294: fix exec.bro from mutating Input::end_of_data event
+    parameters. (Johanna Amann)
+
+  * Add/invoke "distclean" for testing directories. (Raúl Benencia)
+
+  * Delete prebuilt python bytecode files from git. (Jon Siwek)
+
+  * Add Windows detection based on CryptoAPI HTTP traffic as a software
+    framework policy script. (Vlad Grigorescu)
+
 2.3-316 | 2014-11-25 17:35:06 -0800
 
   * Make the SSL analyzer skip further processing once encountering
diff --git a/VERSION b/VERSION
index d6becd7005..aefaa2de2d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3-316
+2.3-326
diff --git a/aux/broctl b/aux/broctl
index 39e865dec9..9bd12e1cbb 160000
--- a/aux/broctl
+++ b/aux/broctl
@@ -1 +1 @@
-Subproject commit 39e865dec9611b9b53b609cbc8df519cebae0a1e
+Subproject commit 9bd12e1cbb249ce35e65beddc2c77fcde3f58a87