old_contents: # -*- coding: utf-8 -*-
  
  from __future__ import absolute_import
  from __future__ import print_function
  from __future__ import unicode_literals
  from __future__ import with_statement
  
  from txtorcon._metadata import __version__, __author__, __contact__
  from txtorcon._metadata import __license__, __copyright__, __url__
  
  from txtorcon.router import Router
  from txtorcon.circuit import Circuit
  from txtorcon.circuit import build_timeout_circuit
  from txtorcon.circuit import CircuitBuildTimedOutError
  from txtorcon.stream import Stream
  from txtorcon.torcontrolprotocol import TorControlProtocol
  from txtorcon.torcontrolprotocol import TorProtocolError
  from txtorcon.torcontrolprotocol import TorProtocolFactory
  from txtorcon.torcontrolprotocol import DEFAULT_VALUE
  from txtorcon.torstate import TorState
  from txtorcon.torstate import build_tor_connection
  from txtorcon.torstate import build_local_tor_connection
  from txtorcon.torconfig import TorConfig
  from txtorcon.torconfig import HiddenService
  from txtorcon.torconfig import EphemeralHiddenService
  from txtorcon.torconfig import TorProcessProtocol
  from txtorcon.torconfig import launch_tor
  from txtorcon.torconfig import TorNotFound
  from txtorcon.torinfo import TorInfo
  from txtorcon.addrmap import AddrMap
  from txtorcon.endpoints import TorOnionAddress
  from txtorcon.endpoints import TorOnionListeningPort
  from txtorcon.endpoints import TCPHiddenServiceEndpoint
  from txtorcon.endpoints import TCPHiddenServiceEndpointParser
  from txtorcon.endpoints import TorClientEndpoint
  from txtorcon.endpoints import TorClientEndpointStringParser
  from txtorcon.endpoints import IHiddenService, IProgressProvider
  
  from txtorcon.endpoints import get_global_tor
  from . import util
  from . import interface
  from txtorcon.interface import (
      ITorControlProtocol,
      IStreamListener, IStreamAttacher, StreamListenerMixin,
      ICircuitContainer, ICircuitListener,
      IRouterContainer, IAddrListener,
  )
  
  __all__ = [
      "Router",
      "Circuit",
      "Stream",
      "TorControlProtocol", "TorProtocolError", "TorProtocolFactory",
      "TorState", "DEFAULT_VALUE",
      "TorInfo",
      "build_tor_connection", "build_local_tor_connection", "launch_tor",
      "TorNotFound", "TorConfig", "HiddenService", "EphemeralHiddenService",
      "TorProcessProtocol",
      "TorInfo",
      "TCPHiddenServiceEndpoint", "TCPHiddenServiceEndpointParser",
      "TorClientEndpoint", "TorClientEndpointStringParser",
      "IHiddenService", "IProgressProvider",
      "TorOnionAddress", "TorOnionListeningPort",
      "get_global_tor",
      "build_timeout_circuit",
      "CircuitBuildTimedOutError",
  
      "AddrMap",
      "util", "interface",
      "ITorControlProtocol",
      "IStreamListener", "IStreamAttacher", "StreamListenerMixin",
      "ICircuitContainer", "ICircuitListener", "CircuitListenerMixin",
      "IRouterContainer", "IAddrListener", "IProgressProvider",
  
      "__version__", "__author__", "__contact__",
      "__license__", "__copyright__", "__url__",
  ]
  
new_contents: # -*- coding: utf-8 -*-
  
  from __future__ import absolute_import
  from __future__ import print_function
  from __future__ import unicode_literals
  from __future__ import with_statement
  
  from txtorcon._metadata import __version__, __author__, __contact__
  from txtorcon._metadata import __license__, __copyright__, __url__
  
  from txtorcon.router import Router
  from txtorcon.circuit import Circuit
  from txtorcon.circuit import build_timeout_circuit
  from txtorcon.circuit import CircuitBuildTimedOutError
  from txtorcon.stream import Stream
  from txtorcon.torcontrolprotocol import TorControlProtocol
  from txtorcon.torcontrolprotocol import TorProtocolError
  from txtorcon.torcontrolprotocol import TorProtocolFactory
  from txtorcon.torcontrolprotocol import DEFAULT_VALUE
  from txtorcon.torstate import TorState
  from txtorcon.torstate import build_tor_connection
  from txtorcon.torstate import build_local_tor_connection
  from txtorcon.torconfig import TorConfig
  from txtorcon.torconfig import HiddenService
  from txtorcon.torconfig import EphemeralHiddenService
  from txtorcon.torconfig import TorProcessProtocol
  from txtorcon.torconfig import launch_tor
  from txtorcon.torconfig import TorNotFound
  from txtorcon.torinfo import TorInfo
  from txtorcon.addrmap import AddrMap
  from txtorcon.endpoints import TorOnionAddress
  from txtorcon.endpoints import TorOnionListeningPort
  from txtorcon.endpoints import TCPHiddenServiceEndpoint
  from txtorcon.endpoints import TCPHiddenServiceEndpointParser
  from txtorcon.endpoints import TorClientEndpoint
  from txtorcon.endpoints import TorClientEndpointStringParser
  from txtorcon.endpoints import IHiddenService, IProgressProvider
  
  from txtorcon.endpoints import get_global_tor
  from . import util
  from . import interface
  from txtorcon.interface import (
      ITorControlProtocol,
      IStreamListener, IStreamAttacher, StreamListenerMixin,
      ICircuitContainer, ICircuitListener, CircuitListenerMixin,
      IRouterContainer, IAddrListener,
  )
  
  __all__ = [
      "Router",
      "Circuit",
      "Stream",
      "TorControlProtocol", "TorProtocolError", "TorProtocolFactory",
      "TorState", "DEFAULT_VALUE",
      "TorInfo",
      "build_tor_connection", "build_local_tor_connection", "launch_tor",
      "TorNotFound", "TorConfig", "HiddenService", "EphemeralHiddenService",
      "TorProcessProtocol",
      "TorInfo",
      "TCPHiddenServiceEndpoint", "TCPHiddenServiceEndpointParser",
      "TorClientEndpoint", "TorClientEndpointStringParser",
      "IHiddenService", "IProgressProvider",
      "TorOnionAddress", "TorOnionListeningPort",
      "get_global_tor",
      "build_timeout_circuit",
      "CircuitBuildTimedOutError",
  
      "AddrMap",
      "util", "interface",
      "ITorControlProtocol",
      "IStreamListener", "IStreamAttacher", "StreamListenerMixin",
      "ICircuitContainer", "ICircuitListener", "CircuitListenerMixin",
      "IRouterContainer", "IAddrListener", "IProgressProvider",
  
      "__version__", "__author__", "__contact__",
      "__license__", "__copyright__", "__url__",
  ]
  
subject: fix imports for __init__ (CircuitListenerMixin misisng)