[Pkg-privacy-commits] [txtorcon] 02/03: Merge branch 'master' into tordeb-stretch

[Iain R. Learmonth]

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

irl pushed a commit to branch tordeb-stretch
in repository txtorcon.

commit 72c281beebfc89612b72bd0988bce3ac79eba20e
Merge: 5ad031f 8bf7bb9
Author: Iain R. Learmonth <irl at fsfe.org>
Date:   Sun Oct 30 13:43:52 2016 +0000

    Merge branch 'master' into tordeb-stretch

 INSTALL                                     |   4 +-
 Makefile                                    |   6 +-
 PKG-INFO                                    |  20 +-
 README.rst                                  |  13 +-
 debian/changelog                            |  38 +++
 debian/control                              |  20 +-
 dev-requirements.txt                        |   4 +-
 docs/README.rst                             | 233 ++++++++++++++++-
 docs/conf.py                                |   2 +-
 docs/howtos.rst                             |  20 +-
 docs/index.rst                              |   2 +-
 docs/release-checklist.rst                  | 211 ++++++++--------
 docs/releases.rst                           |  91 ++++++-
 docs/tutorial.rst                           | 262 +++++++++++++++++++
 docs/txtorcon-config.rst                    |   2 +
 docs/txtorcon-launching.rst                 |   5 +
 docs/txtorcon-protocol.rst                  |   8 +
 docs/walkthrough.rst                        | 329 ++++++++++++------------
 examples/add_hiddenservice_to_system_tor.py |  63 +++++
 examples/ephemeral_endpoint.py              |  57 ++---
 examples/gui-boom.py                        |  39 +++
 examples/gui-cairo.py                       |  94 +++++++
 examples/gui-map.py                         |  66 +++++
 examples/gui.py                             |  83 ++++++
 examples/gui2.py                            |  52 ++++
 examples/hidden_echo.py                     |  16 --
 examples/list_circuits.py                   |  25 --
 examples/multiple-socks-ports.py            |  42 ----
 examples/redirect_streams.py                |  56 -----
 examples/stem_relay_descriptor.py           |   2 +-
 examples/tunnel_tls_through_tor_client.py   |  30 +++
 requirements.txt                            |   2 +-
 scripts/asciinema-demo1.py                  |  72 ++++++
 setup.py                                    | 133 +++++-----
 test/test_circuit.py                        |  32 ++-
 test/test_endpoints.py                      | 282 +++++++++++++++------
 test/test_stream.py                         |  25 ++
 test/test_torconfig.py                      | 378 +++++++++++++++++++++++++++-
 test/test_torcontrolprotocol.py             | 102 +++++++-
 test/test_torinfo.py                        |   2 +-
 test/test_torstate.py                       |  63 ++++-
 test/test_util.py                           |  66 ++++-
 test/test_util_imports.py                   |  32 +--
 txtorcon.egg-info/PKG-INFO                  |  20 +-
 txtorcon.egg-info/SOURCES.txt               |  14 +-
 txtorcon.egg-info/pbr.json                  |   2 +-
 txtorcon.egg-info/requires.txt              |   6 +-
 txtorcon.egg-info/top_level.txt             |   2 +-
 txtorcon/__init__.py                        |  77 +++---
 txtorcon/_metadata.py                       |   6 +
 txtorcon/addrmap.py                         |   2 +
 txtorcon/circuit.py                         |  51 ++--
 txtorcon/endpoints.py                       | 233 ++++++++++-------
 txtorcon/interface.py                       |  16 --
 txtorcon/stream.py                          |  39 ++-
 txtorcon/torconfig.py                       | 294 +++++++++++++++++++---
 txtorcon/torcontrolprotocol.py              | 170 ++++++++-----
 txtorcon/torstate.py                        |  54 ++--
 txtorcon/util.py                            |  52 +++-
 59 files changed, 3185 insertions(+), 937 deletions(-)

diff --cc debian/changelog
index e7c5777,5916cbb..e408379
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,40 +1,47 @@@
+ txtorcon (0.17.0-1) unstable; urgency=medium
+ 
+   * New upstream release 0.17.1
+ 
+  -- Iain R. Learmonth <irl at debian.org>  Sun, 30 Oct 2016 13:31:37 +0000
+ 
 +txtorcon (0.14.2-1~tpo9+1) stretch-backport; urgency=medium
 +
 +  * Rebuild for stretch (for deb.torproject.org).
 +
 + -- Iain R. Learmonth <irl at debian.org>  Sun, 19 Jun 2016 09:16:32 +0100
 +
+ txtorcon (0.16.1-1) unstable; urgency=medium
+ 
+   * New upstream version 0.16.1
+ 
+  -- Iain R. Learmonth <irl at debian.org>  Mon, 05 Sep 2016 10:02:12 +0100
+ 
+ txtorcon (0.15.1-2) unstable; urgency=medium
+ 
+   * debian/control:
+    - Removed dependency on python-ipaddr
+    - Added dependency on python-ipaddress
+ 
+  -- Iain R. Learmonth <irl at debian.org>  Mon, 15 Aug 2016 12:47:20 +0100
+ 
+ txtorcon (0.15.1-1) unstable; urgency=medium
+ 
+   * Imported Upstream version 0.15.1
+    - Fixes circuit.age default-value (Closes: #833821)
+ 
+  -- Iain R. Learmonth <irl at debian.org>  Mon, 15 Aug 2016 10:47:56 +0100
+ 
+ txtorcon (0.15.0-1) unstable; urgency=medium
+ 
+   * Imported Upstream version 0.15.0
+   * debian/control:
+    - Standards version updated to 3.9.8
+    - Removed unnecessary versioned dependencies: python-all, python-ipaddr,
+      python-twisted, python-zope.interface
+ 
+  -- Iain R. Learmonth <irl at debian.org>  Wed, 03 Aug 2016 14:30:35 +0100
++>>>>>>> master
+ 
  txtorcon (0.14.2-1) unstable; urgency=medium
  
    * Imported Upstream version 0.14.2

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