diff --git a/CHANGES.md b/CHANGES.md
index b44248e264..de869001b3 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,34 @@
+Synapse 1.20.0rc5 (2020-09-18)
+==============================
+
+Features
+--------
+
+- Add flags to the `/versions` endpoint that includes whether new rooms default to using E2EE. ([\#8343](https://github.com/matrix-org/synapse/issues/8343))
+
+
+Bugfixes
+--------
+
+- Fix ratelimitng of federation `/send` requests. ([\#8342](https://github.com/matrix-org/synapse/issues/8342))
+- Fix a longstanding bug where back pagination over federation could get stuck if it failed to handle a received event. ([\#8349](https://github.com/matrix-org/synapse/issues/8349))
+
+
+Internal Changes
+----------------
+
+- Blacklist [MSC2753](https://github.com/matrix-org/matrix-doc/pull/2753) SyTests until it is implemented. ([\#8285](https://github.com/matrix-org/synapse/issues/8285))
+
+
+Synapse 1.19.3 (2020-09-18)
+===========================
+
+Bugfixes
+--------
+
+- Partially mitigate bug where newly joined servers couldn't get past events in a room when there is a malformed event. ([\#8350](https://github.com/matrix-org/synapse/issues/8350))
+
+
Synapse 1.20.0rc4 (2020-09-16)
==============================
diff --git a/changelog.d/8285.misc b/changelog.d/8285.misc
deleted file mode 100644
index 4646664ba1..0000000000
--- a/changelog.d/8285.misc
+++ /dev/null
@@ -1 +0,0 @@
-Blacklist [MSC2753](https://github.com/matrix-org/matrix-doc/pull/2753) SyTests until it is implemented.
\ No newline at end of file
diff --git a/changelog.d/8342.bugfix b/changelog.d/8342.bugfix
deleted file mode 100644
index 786057facb..0000000000
--- a/changelog.d/8342.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix ratelimitng of federation `/send` requests.
diff --git a/changelog.d/8343.feature b/changelog.d/8343.feature
deleted file mode 100644
index ccecb22f37..0000000000
--- a/changelog.d/8343.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add flags to the `/versions` endpoint that includes whether new rooms default to using E2EE.
diff --git a/changelog.d/8349.bugfix b/changelog.d/8349.bugfix
deleted file mode 100644
index cf2f531b14..0000000000
--- a/changelog.d/8349.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a longstanding bug where back pagination over federation could get stuck if it failed to handle a received event.
diff --git a/debian/changelog b/debian/changelog
index bb7c175ada..dbf01d6b1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,12 @@ matrix-synapse-py3 (1.20.0ubuntu1) UNRELEASED; urgency=medium
-- Dexter Chua <dec41@srcf.net> Wed, 26 Aug 2020 12:41:36 +0000
+matrix-synapse-py3 (1.19.3) stable; urgency=medium
+
+ * New synapse release 1.19.3.
+
+ -- Synapse Packaging team <packages@matrix.org> Fri, 18 Sep 2020 14:59:30 +0100
+
matrix-synapse-py3 (1.19.2) stable; urgency=medium
* New synapse release 1.19.2.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 6b11c5681b..a95753dcc7 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -48,7 +48,7 @@ try:
except ImportError:
pass
-__version__ = "1.20.0rc4"
+__version__ = "1.20.0rc5"
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
diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py
index a2e8d96ea2..d42930d1b9 100644
--- a/synapse/federation/federation_client.py
+++ b/synapse/federation/federation_client.py
@@ -217,11 +217,9 @@ class FederationClient(FederationBase):
for p in transaction_data["pdus"]
]
- # FIXME: We should handle signature failures more gracefully.
- pdus[:] = await make_deferred_yieldable(
- defer.gatherResults(
- self._check_sigs_and_hashes(room_version, pdus), consumeErrors=True,
- ).addErrback(unwrapFirstError)
+ # Check signatures and hash of pdus, removing any from the list that fail checks
+ pdus[:] = await self._check_sigs_and_hash_and_fetch(
+ dest, pdus, outlier=True, room_version=room_version
)
return pdus
|
