diff options
| author | Erik Rose <erik@mozilla.com> | 2016-01-09 01:08:30 +0300 |
|---|---|---|
| committer | Erik Rose <erik@mozilla.com> | 2016-01-09 01:08:30 +0300 |
| commit | f2586fbc11070bb58e55183b2b85242cb57186c8 (patch) | |
| tree | 7cb353462eb11d5925c3ddd8f1799e6e47a7b65e /setup.py | |
| parent | cd43e9035bf1a368bc72536525910ca1d12367fc (diff) | |
| parent | e8705720be1a82fbf72f8c24463dd32f3ef8ad83 (diff) | |
Merge master in so Travis will test this PR.
Diffstat (limited to 'setup.py')
| -rw-r--r-- | setup.py | 2 |
1 files changed, 1 insertions, 1 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', |