From a86ec56012136664688fa4a8efcd866b5e3e17a8 Mon Sep 17 00:00:00 2001
From: Maximilian Hils <git@maximilianhils.com>
Date: Sun, 30 Aug 2015 15:27:29 +0200
Subject: move files around

---
 libmproxy/proxy/__init__.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'libmproxy/proxy/__init__.py')

diff --git a/libmproxy/proxy/__init__.py b/libmproxy/proxy/__init__.py
index 709654cb..d5297cb1 100644
--- a/libmproxy/proxy/__init__.py
+++ b/libmproxy/proxy/__init__.py
@@ -1,11 +1,9 @@
 from __future__ import (absolute_import, print_function, division)
 
-from .primitives import Log, Kill
+from .server import ProxyServer, DummyServer
 from .config import ProxyConfig
-from .connection import ClientConnection, ServerConnection
 
 __all__ = [
-    "Log", "Kill",
+    "ProxyServer", "DummyServer",
     "ProxyConfig",
-    "ClientConnection", "ServerConnection"
-]
\ No newline at end of file
+]
-- 
cgit v1.2.3