diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-03-18 17:19:57 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-03-18 17:19:57 +0100 |
| commit | d5cfc1c080e2736afb478a310afe525ab493a72f (patch) | |
| tree | 6157b0d0324698436aff8419522557ed4b3e628d /libmproxy/proxy/primitives.py | |
| parent | ce38a17893791944fb8b4f589e7ce00d79b8ced0 (diff) | |
| parent | a66913d4a30b2ce2dedc58afcf79ad77faead278 (diff) | |
| download | mitmproxy-d5cfc1c080e2736afb478a310afe525ab493a72f.tar.gz mitmproxy-d5cfc1c080e2736afb478a310afe525ab493a72f.tar.bz2 mitmproxy-d5cfc1c080e2736afb478a310afe525ab493a72f.zip | |
Merge pull request #239 from mitmproxy/options_cleanup
Options cleanup
Diffstat (limited to 'libmproxy/proxy/primitives.py')
| -rw-r--r-- | libmproxy/proxy/primitives.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmproxy/proxy/primitives.py b/libmproxy/proxy/primitives.py index 0fa5273b..691db922 100644 --- a/libmproxy/proxy/primitives.py +++ b/libmproxy/proxy/primitives.py @@ -61,7 +61,7 @@ class AddressPriority(object): MANUALLY_CHANGED = 3 """user changed the target address in the ui""" FROM_SETTINGS = 2 - """upstream server from arguments (reverse proxy, forward proxy or from transparent resolver)""" + """upstream server from arguments (reverse proxy, upstream proxy or from transparent resolver)""" FROM_PROTOCOL = 1 """derived from protocol (e.g. absolute-form http requests)""" |