aboutsummaryrefslogtreecommitdiffstats
path: root/setup.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-03-08 15:47:27 +0100
committerMaximilian Hils <git@maximilianhils.com>2014-03-08 15:47:27 +0100
commit2b01c4eee7a52dfb5fd30bb9b248cec87d563db9 (patch)
tree72604de5152bdf15147a78e03a669a207baeac95 /setup.py
parent3032672f10c727623ee085d04d623901dac856df (diff)
parent221973aff6553ffb1d40859c5d35b88d959f9718 (diff)
downloadmitmproxy-2b01c4eee7a52dfb5fd30bb9b248cec87d563db9.tar.gz
mitmproxy-2b01c4eee7a52dfb5fd30bb9b248cec87d563db9.tar.bz2
mitmproxy-2b01c4eee7a52dfb5fd30bb9b248cec87d563db9.zip
Merge branch 'master' of github.com:mitmproxy/mitmproxy
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 d8e25660..624a1a60 100644
--- a/setup.py
+++ b/setup.py
@@ -102,7 +102,7 @@ setup(
"netlib>=%s"%version.VERSION,
"urwid>=1.1",
"pyasn1>0.1.2",
- "pyopenssl>=0.13",
+ "pyopenssl>=0.14",
"Pillow>=2.3.0",
"lxml",
"flask"