[Pkg-privacy-commits] [txtorcon] 02/04: Merge tag 'upstream/0.14.2'

[Iain R. Learmonth]

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

irl pushed a commit to branch master
in repository txtorcon.

commit c43e3bbb4c49621b6b99b5248dd51b86da9b3b6f
Merge: 2466df1 417ee5b
Author: Iain R. Learmonth <irl at debian.org>
Date:   Sun Dec 27 18:55:31 2015 +0000

    Merge tag 'upstream/0.14.2'
    
    Upstream version 0.14.2

 Makefile                       |  9 ++----
 PKG-INFO                       |  2 +-
 docs/releases.rst              | 18 ++++++++++++
 examples/ephemeral_endpoint.py | 62 ++++++++++++++++++++++++++++++++++++++++++
 setup.py                       |  2 +-
 test/test_circuit.py           | 59 +++++++++++++++++++++++++++++++++++++++-
 txtorcon.egg-info/PKG-INFO     |  2 +-
 txtorcon.egg-info/SOURCES.txt  |  2 +-
 txtorcon.egg-info/pbr.json     |  2 +-
 txtorcon/__init__.py           |  2 +-
 txtorcon/_metadata.py          |  6 ----
 txtorcon/circuit.py            | 35 ++++++++++++++++++------
 txtorcon/endpoints.py          | 17 ++++++++++--
 txtorcon/torcontrolprotocol.py |  4 ++-
 txtorcon/torstate.py           |  3 ++
 15 files changed, 194 insertions(+), 31 deletions(-)

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