Merge remote-tracking branch 'origin/master' into release-v1.20.0
3 files changed, 17 insertions, 2 deletions
diff --git a/CHANGES.md b/CHANGES.md
index dd4d110981..4d210b96c5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,13 @@
+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/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 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.
|
