diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-09-06 12:42:52 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-09-06 12:42:52 +0200 |
| commit | 0e0cff638c1e055275e77e2af0ae540542f77197 (patch) | |
| tree | ba66312a2b8f91281eea0ca8cc77ce9685e9868b /libmproxy/cmdline.py | |
| parent | 1135666ee6fb145491eb6d07435eb0cf58b2094f (diff) | |
| parent | 3a8f6488074ed7adf596637b77356553ccfca575 (diff) | |
| download | mitmproxy-0e0cff638c1e055275e77e2af0ae540542f77197.tar.gz mitmproxy-0e0cff638c1e055275e77e2af0ae540542f77197.tar.bz2 mitmproxy-0e0cff638c1e055275e77e2af0ae540542f77197.zip | |
Merge branch 'master' into issue_341
Diffstat (limited to 'libmproxy/cmdline.py')
| -rw-r--r-- | libmproxy/cmdline.py | 3 |
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() |