diff options
| author | Sandor Nemes <snemes@users.noreply.github.com> | 2016-01-13 15:05:29 +0100 |
|---|---|---|
| committer | Sandor Nemes <snemes@users.noreply.github.com> | 2016-01-13 15:05:29 +0100 |
| commit | d12e256749df2e85d1a19072254335129013ec43 (patch) | |
| tree | ef24fb117b717565aee69e14671e82d63db33e9f /setup.py | |
| parent | b8e8c4d68222c9292daf23e6ace55351fcef1af6 (diff) | |
| parent | e1e2f7464eb4e79328ba681fb2bf9b8ade741336 (diff) | |
| download | mitmproxy-d12e256749df2e85d1a19072254335129013ec43.tar.gz mitmproxy-d12e256749df2e85d1a19072254335129013ec43.tar.bz2 mitmproxy-d12e256749df2e85d1a19072254335129013ec43.zip | |
Merge branch 'master' into master
Diffstat (limited to 'setup.py')
| -rw-r--r-- | setup.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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", |