diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-08-30 03:24:05 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-08-30 03:24:05 +0200 |
| commit | 08655cb9567f502ec79799499968c57125d9a205 (patch) | |
| tree | 6a993b5299ca7d4ce06372c674efdac635c4d2cd /libmproxy/main.py | |
| parent | 21e7f420d2870d89ebc05181c1fca674d80e4e7c (diff) | |
| parent | 9389c186ba6e76ba87e238c0e6b86749da6a67c7 (diff) | |
| download | mitmproxy-08655cb9567f502ec79799499968c57125d9a205.tar.gz mitmproxy-08655cb9567f502ec79799499968c57125d9a205.tar.bz2 mitmproxy-08655cb9567f502ec79799499968c57125d9a205.zip | |
Merge remote-tracking branch 'origin/master' into proxy-refactor-cb
Diffstat (limited to 'libmproxy/main.py')
| -rw-r--r-- | libmproxy/main.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libmproxy/main.py b/libmproxy/main.py index faef8c82..23cb487c 100644 --- a/libmproxy/main.py +++ b/libmproxy/main.py @@ -55,6 +55,7 @@ def mitmproxy(args=None): # pragma: nocover console_options.eventlog = options.eventlog console_options.intercept = options.intercept console_options.limit = options.limit + console_options.no_mouse = options.no_mouse server = get_server(console_options.no_server, proxy_config) |