aboutsummaryrefslogtreecommitdiffstats
path: root/setup.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-01-10 18:20:41 +0100
committerMaximilian Hils <git@maximilianhils.com>2016-01-10 18:20:41 +0100
commit46428412d6df33f449c254be4dccc8117d0c4a66 (patch)
tree63179f9f6b497632e1236bd7ccb4fd5da512fb76 /setup.py
parentd1e6b5366c97dd31c9b9606db2bb7a8520cfbd2c (diff)
parent739806bfe2d002e5faed6fb343a0af614198d2dd (diff)
downloadmitmproxy-46428412d6df33f449c254be4dccc8117d0c4a66.tar.gz
mitmproxy-46428412d6df33f449c254be4dccc8117d0c4a66.tar.bz2
mitmproxy-46428412d6df33f449c254be4dccc8117d0c4a66.zip
Merge pull request #111 from felixonmars/master
Allow cryptography 1.2.*
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index d411a498..0cc81a1b 100644
--- 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.1.1, <1.3",
"passlib>=1.6.5, <1.7",
"hpack>=2.0.1, <2.1",
"six>=1.10.0, <1.11",