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, 1 insertions, 1 deletions

diff --git a/mitmdump b/mitmdump
index 8cc4c99f..16087f61 100755
--- a/mitmdump
+++ b/mitmdump
@@ -1,3 +1,3 @@
 #!/usr/bin/env python
 from libmproxy.main import mitmdump
-mitmdump()
\ No newline at end of file
+mitmdump()