Merge branch 'master' into pyopenssl

1 files changed, 1 insertions, 1 deletions

diff --git a/setup.py b/setup.py
index ad7fb6909..550384178 100644
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@ version = meta['version']
 install_requires = [
     'acme=={0}'.format(version),
     'configobj',
-    'cryptography>=0.7',  # load_pem_x509_certificate
+    'cryptography>=0.7,<1.2',  # load_pem_x509_certificate
     'parsedatetime',
     'psutil>=2.1.0',  # net_connections introduced in 2.1.0
     'PyOpenSSL',