aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/proxy/__init__.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-09-08 23:34:43 +0200
committerMaximilian Hils <git@maximilianhils.com>2014-09-08 23:34:43 +0200
commitfbc4bb38df48447f846ae0ff4f87062c827bd632 (patch)
tree3955afbe79f9e9e6497565c1e2a34d9c66234ed9 /libmproxy/proxy/__init__.py
parent7ea8d3ff357e278ba047a18a0dcc4bd434017c79 (diff)
downloadmitmproxy-fbc4bb38df48447f846ae0ff4f87062c827bd632.tar.gz
mitmproxy-fbc4bb38df48447f846ae0ff4f87062c827bd632.tar.bz2
mitmproxy-fbc4bb38df48447f846ae0ff4f87062c827bd632.zip
mitmproxy -> libmproxy.main. do some leanup on the way
Diffstat (limited to 'libmproxy/proxy/__init__.py')
-rw-r--r--libmproxy/proxy/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmproxy/proxy/__init__.py b/libmproxy/proxy/__init__.py
index e4c20030..f33d323b 100644
--- a/libmproxy/proxy/__init__.py
+++ b/libmproxy/proxy/__init__.py
@@ -1,2 +1,2 @@
from .primitives import *
-from .config import ProxyConfig
+from .config import ProxyConfig, process_proxy_options