[Pkg-privacy-commits] [txtorcon] 03/12: Merge tag 'debian/0.8.2-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 ad07f39322f37fc3417fe24360a02938a43046af
Merge: ec7efa2 60f1857
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Sun Dec 8 17:48:30 2013 +0100

    Merge tag 'debian/0.8.2-1' into wheezy
    
    Format: 1.8
    Date: Wed, 27 Nov 2013 21:20:18 +0100
    Source: txtorcon
    Binary: python-txtorcon
    Architecture: source all
    Version: 0.8.2-1
    Distribution: unstable
    Urgency: low
    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.8.2-1) unstable; urgency=low
     .
       * New upstream release.
    Checksums-Sha1:
     ca2e3387498b64eca6872d5f32e25f36c5f9f752 1128 txtorcon_0.8.2-1.dsc
     2202bc9315ccd67f5fb2198b2cf6ace600543c91 152908 txtorcon_0.8.2.orig.tar.gz
     47daeb30d5411b2fe28ceba5dea2413f5322a853 3045 txtorcon_0.8.2-1.debian.tar.gz
     c6bcba1e0d7076d173afadd1d081ace37f66f546 118130 python-txtorcon_0.8.2-1_all.deb
    Checksums-Sha256:
     d61729d75592eadbdac889953ab531e21624d467c809208e5e29dd1a2e34287e 1128 txtorcon_0.8.2-1.dsc
     4b4379d14fc819dafddafc5aacf69b90330be85ab8b58d4d441333053009fcd8 152908 txtorcon_0.8.2.orig.tar.gz
     dac55137e5e28f991d0082df0cfbe5b80c32bcf0db7b27895f8491727ea9a5f7 3045 txtorcon_0.8.2-1.debian.tar.gz
     c9bc33182be45635c62bd2a5b4b6ad3e4c587976f0cb953305e792d09922d894 118130 python-txtorcon_0.8.2-1_all.deb
    Files:
     304314583ba9c9b41df8b0cd1dcca72e 1128 python extra txtorcon_0.8.2-1.dsc
     3618250f4478ef999c39076ca6d25c96 152908 python extra txtorcon_0.8.2.orig.tar.gz
     2a20a0a8b34fe67dbcee8e204848a258 3045 python extra txtorcon_0.8.2-1.debian.tar.gz
     f0ad131db7c35982663b41aba151ca4d 118130 python extra python-txtorcon_0.8.2-1_all.deb

 LICENSE                                            |  20 ++
 Makefile                                           |  12 +-
 PKG-INFO                                           |   2 +-
 debian/changelog                                   |   6 +
 docs/releases.rst                                  |  12 +-
 ...by_country.py => attach_streams_by_country.py~} |   9 +-
 examples/circuit_for_next_stream.py~               | 222 ++++++++-------------
 examples/foo.py                                    |  26 +++
 examples/{attach_streams_by_country.py => foo.py~} |   0
 examples/{launch_tor.py => launch_tor.py~}         |  46 ++---
 ...nch_tor_endpoint.py => launch_tor_endpoint.py~} |   0
 ...plehttpd.py => launch_tor_with_simplehttpd.py~} |   2 +-
 examples/{monitor.py => monitor.py~}               |   1 +
 examples/newnym.py                                 |  53 -----
 examples/nginx.py                                  | 177 ++++++++++++++++
 examples/nginx.py~                                 | 184 +++++++++++++++++
 examples/{monitor.py => stem_integration.py~}      |  22 +-
 ...circuit_logger.py => stream_circuit_logger.py~} |   4 +-
 examples/{webui_server.py => webui_server.py~}     |   0
 setup.py                                           |   2 +-
 txtorcon.egg-info/PKG-INFO                         |   2 +-
 txtorcon.egg-info/SOURCES.txt                      |  13 +-
 txtorcon/__init__.py                               |   2 +-
 txtorcon/test/test_torconfig.py                    |   1 +
 txtorcon/torconfig.py                              |  15 +-
 25 files changed, 581 insertions(+), 252 deletions(-)

diff --cc debian/changelog
index 47f9ba7,5f71cd1..80afa57
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
+ txtorcon (0.8.2-1) unstable; urgency=low
+ 
+   * New upstream release.
+ 
+  -- Jérémy Bobbio <lunar at debian.org>  Wed, 27 Nov 2013 21:20:18 +0100
+ 
 +txtorcon (0.8.1-1~bpo70+1) wheezy-backports; urgency=low
 +
 +  * Rebuild for wheezy-backports.
 +
 + -- Jérémy Bobbio <lunar at debian.org>  Sat, 25 May 2013 23:23:39 +0200
 +
  txtorcon (0.8.1-1) unstable; urgency=low
  
    * New upstream release.

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