aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/cmdline.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 /libmproxy/cmdline.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 'libmproxy/cmdline.py')
-rw-r--r--libmproxy/cmdline.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmproxy/cmdline.py b/libmproxy/cmdline.py
index 8e7ab4a1..7950d40b 100644
--- a/libmproxy/cmdline.py
+++ b/libmproxy/cmdline.py
@@ -387,4 +387,4 @@ def common_options(parser):
help="Allow access to users specified in an Apache htpasswd file."
)
- proxy.certificate_option_group(parser)
+ proxy.ssl_option_group(parser)