summary refs log tree commit diff
diff options
context:
space:
mode:
authorPatrick Cloke <patrickc@matrix.org>2020-09-16 09:00:20 -0400
committerPatrick Cloke <patrickc@matrix.org>2020-09-16 09:00:20 -0400
commit44dec6cbc4bdc4ad09bd6548631281b2d5ca3d7b (patch)
tree9523362d0773b544af3e3ccea20221a4f7476594
parentMerge branch 'master' into develop (diff)
parent1.20.0rc4 (diff)
downloadsynapse-44dec6cbc4bdc4ad09bd6548631281b2d5ca3d7b.tar.xz
Merge tag 'v1.20.0rc4' into develop
Synapse 1.20.0rc4 (2020-09-16)
==============================

Synapse 1.20.0rc4 is identical to 1.20.0rc3, with the addition of the security fix that was included in 1.19.2.
-rw-r--r--CHANGES.md17
-rw-r--r--debian/changelog8
-rw-r--r--synapse/__init__.py2
3 files changed, 25 insertions, 2 deletions
diff --git a/CHANGES.md b/CHANGES.md
index dd4d110981..b44248e264 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,20 @@
+Synapse 1.20.0rc4 (2020-09-16)
+==============================
+
+Synapse 1.20.0rc4 is identical to 1.20.0rc3, with the addition of the security fix that was included in 1.19.2.
+
+
+Synapse 1.19.2 (2020-09-16)
+===========================
+
+Due to the issue below server admins are encouraged to upgrade as soon as possible.
+
+Bugfixes
+--------
+
+- Fix joining rooms over federation that include malformed events. ([\#8324](https://github.com/matrix-org/synapse/issues/8324))
+
+
 Synapse 1.20.0rc3 (2020-09-11)
 ==============================
 
diff --git a/debian/changelog b/debian/changelog
index bde3b636ee..bb7c175ada 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
-matrix-synapse-py3 (1.19.0ubuntu1) UNRELEASED; urgency=medium
+matrix-synapse-py3 (1.20.0ubuntu1) UNRELEASED; urgency=medium
 
   * Use Type=notify in systemd service
 
  -- Dexter Chua <dec41@srcf.net>  Wed, 26 Aug 2020 12:41:36 +0000
 
+matrix-synapse-py3 (1.19.2) stable; urgency=medium
+
+  * New synapse release 1.19.2.
+
+ -- Synapse Packaging team <packages@matrix.org>  Wed, 16 Sep 2020 12:50:30 +0100
+
 matrix-synapse-py3 (1.19.1) stable; urgency=medium
 
   * New synapse release 1.19.1.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index bf0bf192a5..6b11c5681b 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -48,7 +48,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.20.0rc3"
+__version__ = "1.20.0rc4"
 
 if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
     # We import here so that we don't have to install a bunch of deps when