move wormhole.twisted.tor_manager up to wormhole/

src/wormhole/cli/cmd_receive.py

@@ -38,7 +38,7 @@ class TwistedReceiver:
         tor_manager = None
         if self.args.tor:
             with self.args.timing.add("import", which="tor_manager"):
-                from ..twisted.tor_manager import TorManager
+                from ..tor_manager import TorManager
             tor_manager = TorManager(self._reactor, timing=self.args.timing)
             # For now, block everything until Tor has started. Soon: launch
             # tor in parallel with everything else, make sure the TorManager

src/wormhole/cli/cmd_send.py

@@ -41,7 +41,7 @@ def send(args, reactor=reactor):
     tor_manager = None
     if args.tor:
         with args.timing.add("import", which="tor_manager"):
-            from ..twisted.tor_manager import TorManager
+            from ..tor_manager import TorManager
         tor_manager = TorManager(reactor, timing=args.timing)
         # For now, block everything until Tor has started. Soon: launch tor
         # in parallel with everything else, make sure the TorManager can

src/wormhole/tor_manager.py

@@ -4,8 +4,8 @@ from twisted.internet.defer import inlineCallbacks, returnValue
 from twisted.internet.error import ConnectError
 import txtorcon
 import ipaddr
-from ..timing import DebugTiming
-from ..transit import allocate_tcp_port
+from .timing import DebugTiming
+from .transit import allocate_tcp_port
 
 class TorManager:
     def __init__(self, reactor, tor_socks_port=None, tor_control_port=9051,