[Pkg-privacy-commits] [txtorcon] 36/49: Merge remote-tracking branch 'isis/fix/py3k'

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository txtorcon.

commit 158b9b19ac157d8ccd33cc1ce1e9bdcb4114b4b9
Merge: 5ac2297 6a909b3
Author: meejah <meejah at meejah.ca>
Date:   Tue Sep 8 11:07:07 2015 -0600

    Merge remote-tracking branch 'isis/fix/py3k'
    
    Conflicts:
    	setup.py
    	txtorcon/endpoints.py

 setup.py                       | 11 ++++++++---
 txtorcon/__init__.py           | 11 +++++++++--
 txtorcon/addrmap.py            |  7 +++++++
 txtorcon/circuit.py            | 11 +++++++++--
 txtorcon/endpoints.py          | 12 +++++++++---
 txtorcon/interface.py          | 15 +++++++++++----
 txtorcon/log.py                |  7 +++++++
 txtorcon/router.py             | 15 +++++++++++----
 txtorcon/spaghetti.py          |  6 ++++++
 txtorcon/stream.py             |  7 +++++++
 txtorcon/torconfig.py          | 36 +++++++++++++++++++-----------------
 txtorcon/torcontrolprotocol.py | 26 ++++++++++++++------------
 txtorcon/torinfo.py            | 23 +++++++++++++++--------
 txtorcon/torstate.py           | 23 +++++++++++++++++------
 txtorcon/util.py               | 37 ++++++++++++++++++++++++++++++++-----
 15 files changed, 181 insertions(+), 66 deletions(-)

diff --cc txtorcon/endpoints.py
index 38bff66,1710ce1..1c749ac
--- a/txtorcon/endpoints.py
+++ b/txtorcon/endpoints.py
@@@ -24,10 -26,8 +30,10 @@@ from twisted.python.util import FancyEq
  from zope.interface import implementer
  from zope.interface import Interface, Attribute
  
 +from txsocksx.client import SOCKS5ClientEndpoint
 +
- from torconfig import TorConfig, launch_tor, HiddenService
- from torstate import build_tor_connection
+ from .torconfig import TorConfig, launch_tor, HiddenService
+ from .torstate import build_tor_connection
  
  
  _global_tor_config = None

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/txtorcon.git