From f584d6108fb9f9e2650404ce6b42fad805ddb9ca Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Fri, 24 Aug 2018 10:02:31 +0100
Subject: [PATCH 1/2] Pin to twisted 17.1 or later

Fixes https://github.com/matrix-org/synapse/issues/3741.
---
 synapse/python_dependencies.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
index 987eec3ef..9c55e79ef 100644
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -39,7 +39,7 @@ REQUIREMENTS = {
     "signedjson>=1.0.0": ["signedjson>=1.0.0"],
     "pynacl>=1.2.1": ["nacl>=1.2.1", "nacl.bindings"],
     "service_identity>=1.0.0": ["service_identity>=1.0.0"],
-    "Twisted>=16.0.0": ["twisted>=16.0.0"],
+    "Twisted>=17.1.0": ["twisted>=17.1.0"],
 
     # We use crypto.get_elliptic_curve which is only supported in >=0.15
     "pyopenssl>=0.15": ["OpenSSL>=0.15"],

From 05fe8a6c1c11f922555dbd893811101e1befa99a Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Fri, 24 Aug 2018 10:04:52 +0100
Subject: [PATCH 2/2] changelog

---
 changelog.d/3751.feature | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/3751.feature

diff --git a/changelog.d/3751.feature b/changelog.d/3751.feature
new file mode 100644
index 000000000..dc9742b15
--- /dev/null
+++ b/changelog.d/3751.feature
@@ -0,0 +1 @@
+Require twisted 17.1 or later (fixes [#3741](https://github.com/matrix-org/synapse/issues/3741)).