Merge branch 'master' into master

2024-11-23 08:11:00 +00:00 · 2016-01-13 15:05:29 +01:00 · 2016-01-13 15:05:29 +01:00 · d12e256749
commit d12e256749
parent b8e8c4d682 e1e2f7464e
1 changed files with 1 additions and 1 deletions
--- a/setup.py
+++ b/setup.py
@ -17,7 +17,7 @@ with open(os.path.join(here, 'README.rst'), encoding='utf-8') as f:
 deps = {
    "pyasn1>=0.1.9, <0.2",
    "pyOpenSSL>=0.15.1, <0.16",
-    "cryptography>=1.1.1, <1.2",
+    "cryptography>=1.2.1, <1.3",
    "passlib>=1.6.5, <1.7",
    "hpack>=2.0.1, <2.1",
    "six>=1.10.0, <1.11",