diff options
author | Aldo Cortesi <aldo@corte.si> | 2017-12-12 08:03:09 +1300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-12 08:03:09 +1300 |
commit | 4912920573c71a49670928b19893b965d199f836 (patch) | |
tree | 170034aac0b28e93dfa7e6735b873593d5a5a30a /setup.py | |
parent | 7654ad2d31d294d227e9ed305309c927a2ec0b94 (diff) | |
parent | b09c28d8a6fcd2af4a43b968b800d44c5a8c836e (diff) | |
download | mitmproxy-4912920573c71a49670928b19893b965d199f836.tar.gz mitmproxy-4912920573c71a49670928b19893b965d199f836.tar.bz2 mitmproxy-4912920573c71a49670928b19893b965d199f836.zip |
Merge branch 'master' into browser-win
Diffstat (limited to 'setup.py')
-rw-r--r-- | setup.py | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -70,8 +70,8 @@ setup( "kaitaistruct>=0.7, <0.8", "ldap3>=2.4,<2.5", "passlib>=1.6.5, <1.8", - "pyasn1>=0.3.1, <0.4", - "pyOpenSSL>=17.2,<17.4", + "pyasn1>=0.3.1,<0.5", + "pyOpenSSL>=17.2,<17.6", "pyparsing>=2.1.3, <2.3", "pyperclip>=1.5.22, <1.7", "requests>=2.9.1, <3", |