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

diff --git a/test/tools/getcert b/test/tools/getcert
index 8fabefb7..3bd2bec8 100755
--- a/test/tools/getcert
+++ b/test/tools/getcert
@@ -1,7 +1,10 @@
 #!/usr/bin/env python
 import sys
 sys.path.insert(0, "../..")
-import socket, tempfile, ssl, subprocess
+import socket
+import tempfile
+import ssl
+import subprocess
 
 addr = socket.gethostbyname(sys.argv[1])
 print ssl.get_server_certificate((addr, 443))