summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-08-02 15:31:04 +0100
committerRichard van der Hoff <richard@matrix.org>2018-08-02 15:31:04 +0100
commit14a4e7d5a4e3c90195a907aa9677c058f2932cdb (patch)
tree554460dff067fc237b5bf7065efa84ab9b14bbfe
parentMerge pull request #3642 from matrix-org/rav/another_room_id_check (diff)
downloadsynapse-14a4e7d5a4e3c90195a907aa9677c058f2932cdb.tar.xz
Prepare 0.33.1
-rw-r--r--CHANGES.rst10
-rw-r--r--changelog.d/3641.bugfix1
-rw-r--r--changelog.d/3642.bugfix1
-rw-r--r--synapse/__init__.py2
4 files changed, 11 insertions, 3 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index da6e0eb195..dff195be6e 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,13 @@
+Synapse 0.33.1 (2018-08-02)
+===========================
+
+Bugfixes
+--------
+
+- Fix a potential issue where servers could request events for rooms they have not joined. (`#3641 <https://github.com/matrix-org/synapse/issues/3641>`_)
+- Fix a potential issue where users could see events in private joins before they joined (`#3642 <https://github.com/matrix-org/synapse/issues/3642>`_)
+
+
 Synapse 0.33.0 (2018-07-19)
 ===========================
 
diff --git a/changelog.d/3641.bugfix b/changelog.d/3641.bugfix
deleted file mode 100644
index 149349baa2..0000000000
--- a/changelog.d/3641.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a potential issue where servers could request events for rooms they have not joined.
diff --git a/changelog.d/3642.bugfix b/changelog.d/3642.bugfix
deleted file mode 100644
index e2e9b209de..0000000000
--- a/changelog.d/3642.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a potential issue where users could see events in private joins before they joined
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 5c0f2f83aa..1810cb6fcd 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.0"
+__version__ = "0.33.1"