From 80189ed27c5c1b390cc9783b2931e71cccdb3c74 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Wed, 5 Sep 2018 17:03:49 +0100
Subject: [PATCH] prepare v0.33.3.1

---
 CHANGES.md            | 14 ++++++++++++++
 changelog.d/3802.misc |  1 -
 synapse/__init__.py   |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)
 delete mode 100644 changelog.d/3802.misc

diff --git a/CHANGES.md b/CHANGES.md
index a35f5aebc7..59feb6b1a7 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,17 @@
+Synapse 0.33.3.1 (2018-09-06)
+=============================
+
+SECURITY FIXES
+--------------
+
+- Fix an issue where event signatures were not always correctly validated ([\#3796](https://github.com/matrix-org/synapse/issues/3796))
+- Fix an issue where server_acls could be circumvented for incoming events ([\#3796](https://github.com/matrix-org/synapse/issues/3796))
+
+Internal Changes
+----------------
+
+- Unignore synctl in .dockerignore to fix docker builds ([\#3802](https://github.com/matrix-org/synapse/issues/3802))
+
 Synapse 0.33.3 (2018-08-22)
 ===========================
 
diff --git a/changelog.d/3802.misc b/changelog.d/3802.misc
deleted file mode 100644
index a00eccb283..0000000000
--- a/changelog.d/3802.misc
+++ /dev/null
@@ -1 +0,0 @@
-Unignore synctl in .dockerignore to fix docker builds
diff --git a/synapse/__init__.py b/synapse/__init__.py
index e62901b761..e395a0a9ee 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -17,4 +17,4 @@
 """ This is a reference implementation of a Matrix home server.
 """
 
-__version__ = "0.33.3"
+__version__ = "0.33.3.1"