aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2012-06-07 08:44:36 +1200
committerAldo Cortesi <aldo@nullcube.com>2012-06-07 08:44:36 +1200
commit903038b8de47cbe79fefec410b8f8913d44a5178 (patch)
treedeaed1dd2a1cd4d49831146694a769901554ec50 /libmproxy
parente9109812e114385a9d87d0aade7850a613684d16 (diff)
parent2a194f98ec593419c5943ceb22466cc63d987236 (diff)
downloadmitmproxy-903038b8de47cbe79fefec410b8f8913d44a5178.tar.gz
mitmproxy-903038b8de47cbe79fefec410b8f8913d44a5178.tar.bz2
mitmproxy-903038b8de47cbe79fefec410b8f8913d44a5178.zip
Merge branch 'master' into develop
Diffstat (limited to 'libmproxy')
-rw-r--r--libmproxy/cmdline.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/libmproxy/cmdline.py b/libmproxy/cmdline.py
index 080a80ea..3370ebdf 100644
--- a/libmproxy/cmdline.py
+++ b/libmproxy/cmdline.py
@@ -263,6 +263,7 @@ def common_options(parser):
help="Disable response pop from response flow. "
"This makes it possible to replay same response multiple times."
)
+ parser.add_option_group(group)
group = optparse.OptionGroup(
parser,