Merge remote-tracking branch 'upstream/master' into print-bracket-fix

Conflicts:
	examples/har_extractor.py
	examples/nonblocking.py
	examples/read_dumpfile
	libmproxy/web/app.py

1 files changed, 4 insertions, 0 deletions

diff --git a/test/scripts/a.py b/test/scripts/a.py
index 1d5717b0..210fea78 100644
--- a/test/scripts/a.py
+++ b/test/scripts/a.py
@@ -4,14 +4,18 @@ parser = argparse.ArgumentParser()
 parser.add_argument('--var', type=int)
 
 var = 0
+
+
 def start(ctx, argv):
     global var
     var = parser.parse_args(argv[1:]).var
 
+
 def here(ctx):
     global var
     var += 1
     return var
 
+
 def errargs():
     pass