Merge branch 'master' into mitmproxy_issue_341

Conflicts:
	netlib/tcp.py
This commit is contained in:
Aldo Cortesi 2014-09-07 12:39:59 +12:00
commit f98989b075

View File

@ -495,7 +495,10 @@ class TCPServer(object):
if traceback:
exc = traceback.format_exc()
print('-'*40, file=fp)
print("Error in processing of request from %s:%s" % (client_address.host, client_address.port), file=fp)
print(
"Error in processing of request from %s:%s" % (
client_address.host, client_address.port
), file=fp)
print(exc, file=fp)
print('-'*40, file=fp)