aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/proxy/server.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-09-08 15:36:37 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-09-08 15:36:37 +0200
commit4b8e162a8b5b72c054b5d0f9bcc7801ed8d90e49 (patch)
treed585d558f1860869f00e00199761894d6bd47834 /libmproxy/proxy/server.py
parentc3ba98b68127b1a0d974e564c0c9af97b97f2a06 (diff)
parent8dfa15c2d460839667092e578311fad53cf7bea9 (diff)
downloadmitmproxy-4b8e162a8b5b72c054b5d0f9bcc7801ed8d90e49.tar.gz
mitmproxy-4b8e162a8b5b72c054b5d0f9bcc7801ed8d90e49.tar.bz2
mitmproxy-4b8e162a8b5b72c054b5d0f9bcc7801ed8d90e49.zip
Merge branch 'master' into readthedocs
Diffstat (limited to 'libmproxy/proxy/server.py')
-rw-r--r--libmproxy/proxy/server.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmproxy/proxy/server.py b/libmproxy/proxy/server.py
index 5d067b45..c12bbbfa 100644
--- a/libmproxy/proxy/server.py
+++ b/libmproxy/proxy/server.py
@@ -137,4 +137,4 @@ class ConnectionHandler(object):
def log(self, msg, level):
msg = "{}: {}".format(repr(self.client_conn.address), msg)
- self.channel.tell("log", Log(msg, level)) \ No newline at end of file
+ self.channel.tell("log", Log(msg, level))