diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-03-10 17:02:09 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-03-10 17:02:09 +0100 |
| commit | b59013f6e3d80fa6bbf5640f2652559457f07d0e (patch) | |
| tree | bba552a4d7f089dc422df2aff2a9095153118311 /libmproxy/protocol/__init__.py | |
| parent | 982da23e9a219d055c2137f56b885c06006ca098 (diff) | |
| parent | 9cc10630c8e0b0f249ed852299d3316ba42f128d (diff) | |
| download | mitmproxy-b59013f6e3d80fa6bbf5640f2652559457f07d0e.tar.gz mitmproxy-b59013f6e3d80fa6bbf5640f2652559457f07d0e.tar.bz2 mitmproxy-b59013f6e3d80fa6bbf5640f2652559457f07d0e.zip | |
Merge branch 'absolutely_relative_proxying'
Diffstat (limited to 'libmproxy/protocol/__init__.py')
| -rw-r--r-- | libmproxy/protocol/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmproxy/protocol/__init__.py b/libmproxy/protocol/__init__.py index 6200757f..b253fbd5 100644 --- a/libmproxy/protocol/__init__.py +++ b/libmproxy/protocol/__init__.py @@ -1,4 +1,4 @@ -from libmproxy.proxy.primitives import AddressPriority +from ..proxy.primitives import AddressPriority KILL = 0 # const for killed requests |