From 7d3f639844f50061367db25cac0bd4d189648678 Mon Sep 17 00:00:00 2001
From: Oleg Girko <ol@infoserver.lv>
Date: Mon, 24 Sep 2018 16:51:59 +0100
Subject: [PATCH 1/4] Fix compatibility issue with older Twisted in tests.

Older Twisted (18.4.0) returns TimeoutError instead of
ConnectingCancelledError when connection times out.
This change allows tests to be compatible with this behaviour.

Signed-off-by: Oleg Girko <ol@infoserver.lv>
---
 tests/http/test_fedclient.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/http/test_fedclient.py b/tests/http/test_fedclient.py
index 1c46c9cfeb..d45d2bcb16 100644
--- a/tests/http/test_fedclient.py
+++ b/tests/http/test_fedclient.py
@@ -49,7 +49,7 @@ class FederationClientTests(HomeserverTestCase):
     def test_client_never_connect(self):
         """
         If the HTTP request is not connected and is timed out, it'll give a
-        ConnectingCancelledError.
+        ConnectingCancelledError or TimeoutError.
         """
         d = self.cl._request("testserv:8008", "GET", "foo/bar", timeout=10000)
 
@@ -71,7 +71,7 @@ class FederationClientTests(HomeserverTestCase):
         self.reactor.advance(10.5)
         f = self.failureResultOf(d)
 
-        self.assertIsInstance(f.value, ConnectingCancelledError)
+        self.assertIsInstance(f.value, (ConnectingCancelledError, TimeoutError))
 
     def test_client_connect_no_response(self):
         """

From e37c221b9792caf5a451079d9ce995609fa624f9 Mon Sep 17 00:00:00 2001
From: Amber Brown <hawkowl@atleastfornow.net>
Date: Tue, 25 Sep 2018 02:51:55 +1000
Subject: [PATCH 2/4] changelog for 3940

---
 changelog.d/3940.misc | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 changelog.d/3940.misc

diff --git a/changelog.d/3940.misc b/changelog.d/3940.misc
new file mode 100644
index 0000000000..a39d2bde3e
--- /dev/null
+++ b/changelog.d/3940.misc
@@ -0,0 +1,2 @@
+Fix incompatibility with older Twisted version in tests. Thanks 
+@OlegGirko!

From 6b6cb32297b29a1dc6c415150b8a9a37b38349bf Mon Sep 17 00:00:00 2001
From: Amber Brown <hawkowl@atleastfornow.net>
Date: Tue, 25 Sep 2018 02:54:34 +1000
Subject: [PATCH 3/4] bump version

---
 synapse/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/synapse/__init__.py b/synapse/__init__.py
index 58244a5dd4..b1f7a89fba 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -27,4 +27,4 @@ try:
 except ImportError:
     pass
 
-__version__ = "0.33.5"
+__version__ = "0.33.5.1"

From fc691ca97ca171b81faef83e116a2c11a6816e1b Mon Sep 17 00:00:00 2001
From: Amber Brown <hawkowl@atleastfornow.net>
Date: Tue, 25 Sep 2018 02:54:59 +1000
Subject: [PATCH 4/4] changelog

---
 CHANGES.md            | 10 ++++++++++
 changelog.d/3940.misc |  2 --
 2 files changed, 10 insertions(+), 2 deletions(-)
 delete mode 100644 changelog.d/3940.misc

diff --git a/CHANGES.md b/CHANGES.md
index 58fb9acdda..45d3cdb131 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,13 @@
+Synapse 0.33.5.1 (2018-09-25)
+=============================
+
+Internal Changes
+----------------
+
+- Fix incompatibility with older Twisted version in tests. Thanks 
+  @OlegGirko! ([\#3940](https://github.com/matrix-org/synapse/issues/3940))
+
+
 Synapse 0.33.5 (2018-09-24)
 ===========================
 
diff --git a/changelog.d/3940.misc b/changelog.d/3940.misc
deleted file mode 100644
index a39d2bde3e..0000000000
--- a/changelog.d/3940.misc
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix incompatibility with older Twisted version in tests. Thanks 
-@OlegGirko!