[Pkg-privacy-commits] [txtorcon] 11/12: Merge tag 'debian/0.11.0-1' into wheezy

[Ximin Luo]

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

infinity0 pushed a commit to branch wheezy
in repository txtorcon.

commit 99a17338974bc5f886661b5c4d98c61c1b9f44c1
Merge: 4530336 3d38847
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Sun Aug 24 18:18:06 2014 +0000

    Merge tag 'debian/0.11.0-1' into wheezy
    
    Format: 1.8
    Date: Mon, 18 Aug 2014 12:33:44 +0200
    Source: txtorcon
    Binary: python-txtorcon
    Architecture: source all
    Version: 0.11.0-1
    Distribution: unstable
    Urgency: medium
    Maintainer: Jérémy Bobbio <lunar at debian.org>
    Changed-By: Jérémy Bobbio <lunar at debian.org>
    Description:
     python-txtorcon - Twisted-based asynchronous Tor control protocol implementation
    Changes:
     txtorcon (0.11.0-1) unstable; urgency=medium
     .
       * New upstream release.
    Checksums-Sha1:
     bb9d96b9d9a67dee4c985fa57e3724c34e386fe7 1153 txtorcon_0.11.0-1.dsc
     cf1d395a4463e84df9c406019e08b092a03048d4 192742 txtorcon_0.11.0.orig.tar.gz
     a6517e51b727c7f3e6eeb23e12709f9b2cbff83a 4992 txtorcon_0.11.0-1.debian.tar.xz
     c3ddf42d4a3123c389942e49d1f71f01dcb0d34a 126182 python-txtorcon_0.11.0-1_all.deb
    Checksums-Sha256:
     cedd849eb4188654b5fb1ed2145f65d9df95cc2c201b8265aa45916da99b5ffb 1153 txtorcon_0.11.0-1.dsc
     d2eecaa504b37b0859ac37bbc81cf13a5f668ff35f1028d83c7cf7f4838dadf9 192742 txtorcon_0.11.0.orig.tar.gz
     12a0ffdb6fbf339d4c80a702e1f6a58fc103fe2970fc45ee5e0e6f51a9ab4061 4992 txtorcon_0.11.0-1.debian.tar.xz
     dd2a357105e8d91a76e637d4ce23a79ea08d0e32c9a865045ce082566ba5841e 126182 python-txtorcon_0.11.0-1_all.deb
    Files:
     13106bb8adb951b655cb4fef4e5597e5 126182 python extra python-txtorcon_0.11.0-1_all.deb
     194403f764255c3613d3bfc2aa71afa0 1153 python extra txtorcon_0.11.0-1.dsc
     30febce001f7aa46070dccb89618e0e2 192742 python extra txtorcon_0.11.0.orig.tar.gz
     63e954ee618bbba2a4ee06d037e15758 4992 python extra txtorcon_0.11.0-1.debian.tar.xz

 Makefile                        |  2 +-
 PKG-INFO                        |  2 +-
 debian/changelog                |  6 ++++
 docs/index.rst                  |  1 +
 docs/release-checklist.rst      | 12 ++++++++
 docs/releases.rst               | 17 ++++++++++-
 setup.py                        |  4 +--
 test/test_endpoints.py          |  2 +-
 test/test_torconfig.py          | 32 +++++++++++++------
 test/test_torcontrolprotocol.py |  3 ++
 txtorcon.egg-info/PKG-INFO      |  2 +-
 txtorcon/__init__.py            |  4 +--
 txtorcon/circuit.py             |  2 +-
 txtorcon/endpoints.py           | 33 ++------------------
 txtorcon/torconfig.py           | 68 +++++++++++++++++++++++++++++++----------
 txtorcon/torstate.py            | 14 ++++++---
 txtorcon/util.py                | 39 ++++++++++++++++++++---
 17 files changed, 167 insertions(+), 76 deletions(-)

diff --cc debian/changelog
index 10beeb9,3524840..536578c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
+ txtorcon (0.11.0-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Jérémy Bobbio <lunar at debian.org>  Mon, 18 Aug 2014 12:33:44 +0200
+ 
 +txtorcon (0.10.1-1~bpo70+1) wheezy-backports; urgency=medium
 +
 +  * Rebuild for wheezy-backports.
 +
 + -- Jérémy Bobbio <lunar at debian.org>  Mon, 28 Jul 2014 10:25:03 +0200
 +
  txtorcon (0.10.1-1) unstable; urgency=medium
  
    * New upstream release.

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