aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-09-06 12:43:32 +0200
committerMaximilian Hils <git@maximilianhils.com>2014-09-06 12:43:32 +0200
commitfdd7b2f108717900e39e3d0ab220ee65b79304ef (patch)
treec3f5aed62bcf13378522968a1c77375dc8102b53 /libmproxy
parentccb61829175b6ecb15cc753c5d134fe7b445b2ef (diff)
parent0e0cff638c1e055275e77e2af0ae540542f77197 (diff)
downloadmitmproxy-fdd7b2f108717900e39e3d0ab220ee65b79304ef.tar.gz
mitmproxy-fdd7b2f108717900e39e3d0ab220ee65b79304ef.tar.bz2
mitmproxy-fdd7b2f108717900e39e3d0ab220ee65b79304ef.zip
Merge branch 'issue_341' into server_change_api
Diffstat (limited to 'libmproxy')
-rw-r--r--libmproxy/cmdline.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/libmproxy/cmdline.py b/libmproxy/cmdline.py
index b9e62b71..28156a59 100644
--- a/libmproxy/cmdline.py
+++ b/libmproxy/cmdline.py
@@ -421,8 +421,7 @@ def common_options(parser):
"Proxy Authentication",
"""
Specify which users are allowed to access the proxy and the method
- used for authenticating them. These options are ignored if the
- proxy is in transparent or reverse proxy mode.
+ used for authenticating them.
"""
)
user_specification_group = group.add_mutually_exclusive_group()