Merge master in so Travis will test this PR.

2026-07-28 08:45:22 +02:00 · 2016-01-08 17:08:30 -05:00
parent cd43e9035b e8705720be
commit f2586fbc11
19 changed files with 249 additions and 136 deletions
@@ -33,7 +33,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',