summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-09-16 13:37:03 +0100
committerErik Johnston <erik@matrix.org>2020-09-16 13:37:03 +0100
commit5ffd68dca12e78b0e173a563918b71249c467b40 (patch)
tree989ed06ae179d4de17a1d8fb1cab6888a05b77d6
parentMerge branch 'erikj/fix_origin_check' into release-v1.19.2 (diff)
downloadsynapse-5ffd68dca12e78b0e173a563918b71249c467b40.tar.xz
-rw-r--r--CHANGES.md11
-rw-r--r--changelog.d/8324.bugfix1
-rw-r--r--debian/changelog6
-rw-r--r--synapse/__init__.py2
4 files changed, 18 insertions, 2 deletions
diff --git a/CHANGES.md b/CHANGES.md
index d859baa9ff..d82b30c66c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,14 @@
+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.19.1 (2020-08-27)
 ===========================
 
diff --git a/changelog.d/8324.bugfix b/changelog.d/8324.bugfix
deleted file mode 100644
index 32788a9284..0000000000
--- a/changelog.d/8324.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix fetching events from remote servers that are malformed.
diff --git a/debian/changelog b/debian/changelog
index 6676706dea..6d60db6084 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+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 1282d19b3c..078914695a 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -48,7 +48,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.19.1"
+__version__ = "1.19.2"
 
 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