diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-08-16 12:47:13 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-08-16 12:47:13 +0200 |
| commit | 61afac863791aaf08b5b6d32c216de67144f8401 (patch) | |
| tree | 7f2bb9afce857b38fd6295dab1e9a02e53f179e1 /libmproxy/protocol2/layer.py | |
| parent | 4c31ffd90fcc273f798b9a5be96c811fbedb5e2e (diff) | |
| parent | 1e40d34e942382bbb11234e0e9232794b3bf6acf (diff) | |
| download | mitmproxy-61afac863791aaf08b5b6d32c216de67144f8401.tar.gz mitmproxy-61afac863791aaf08b5b6d32c216de67144f8401.tar.bz2 mitmproxy-61afac863791aaf08b5b6d32c216de67144f8401.zip | |
Merge remote-tracking branch 'Kriechi/proxy-refactor' into proxy-refactor
Conflicts:
libmproxy/protocol2/http_proxy.py
libmproxy/protocol2/tls.py
libmproxy/proxy/connection.py
Diffstat (limited to 'libmproxy/protocol2/layer.py')
| -rw-r--r-- | libmproxy/protocol2/layer.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmproxy/protocol2/layer.py b/libmproxy/protocol2/layer.py index ca297c0e..c1648a62 100644 --- a/libmproxy/protocol2/layer.py +++ b/libmproxy/protocol2/layer.py @@ -207,4 +207,4 @@ def yield_from_callback(fun): self.yield_from_callback = None - return wrapper
\ No newline at end of file + return wrapper |