diff options
| author | Aldo Cortesi <aldo@corte.si> | 2014-09-07 12:59:35 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@corte.si> | 2014-09-07 12:59:35 +1200 |
| commit | 3d62e90dbf7ea05283e16752531a261e53a4bb47 (patch) | |
| tree | c3f5aed62bcf13378522968a1c77375dc8102b53 /libmproxy/proxy/__init__.py | |
| parent | 0e0cff638c1e055275e77e2af0ae540542f77197 (diff) | |
| parent | fdd7b2f108717900e39e3d0ab220ee65b79304ef (diff) | |
| download | mitmproxy-3d62e90dbf7ea05283e16752531a261e53a4bb47.tar.gz mitmproxy-3d62e90dbf7ea05283e16752531a261e53a4bb47.tar.bz2 mitmproxy-3d62e90dbf7ea05283e16752531a261e53a4bb47.zip | |
Merge pull request #342 from mitmproxy/server_change_api
Server change api
Diffstat (limited to 'libmproxy/proxy/__init__.py')
| -rw-r--r-- | libmproxy/proxy/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libmproxy/proxy/__init__.py b/libmproxy/proxy/__init__.py index f5d6a2d0..e4c20030 100644 --- a/libmproxy/proxy/__init__.py +++ b/libmproxy/proxy/__init__.py @@ -1 +1,2 @@ -from .primitives import *
\ No newline at end of file +from .primitives import * +from .config import ProxyConfig |