Merge pull request mitmproxy#2509 from ujjwal96/compat

Fixes mitmproxy#2495
Oliver-Fish · Aug 9, 2017 · bb0ab45 · bb0ab45
2 parents 802e8cb + a4048c8
commit bb0ab45
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/mitmproxy/io/compat.py b/mitmproxy/io/compat.py
@@ -58,7 +58,7 @@ def convert_017_018(data):
     # convert_unicode needs to be called for every dual release and the first py3-only release
     data = convert_unicode(data)
 
-    data["server_conn"]["ip_address"] = data["server_conn"].pop("peer_address")
+    data["server_conn"]["ip_address"] = data["server_conn"].pop("peer_address", None)
     data["marked"] = False
     data["version"] = (0, 18)
     return data