[tor-commits] [stem/master] Merge version 1.7.1 hotfix

[atagar@xxxxxxxxxxxxxx]

commit bf267fe1d1612a6e24f08775268bcf3148977a5f
Merge: 991291cd 5488849b
Author: Damian Johnson <atagar@xxxxxxxxxxxxxx>
Date:   Wed Dec 26 15:06:10 2018 -0800

    Merge version 1.7.1 hotfix

 docs/_static/digest_chart.png                      | Bin 0 -> 66121 bytes
 docs/_static/example/check_digests.py              |  52 +++
 docs/_static/label/netbsd.png                      | Bin 0 -> 1480 bytes
 docs/_static/label/resources/netbsd.xcf            | Bin 0 -> 3004 bytes
 docs/_static/section/download/netbsd.png           | Bin 0 -> 5485 bytes
 docs/_static/style.css                             |   5 +
 docs/change_log.rst                                |  27 +-
 docs/download.rst                                  |  27 +-
 docs/tutorials/double_double_toil_and_trouble.rst  |   5 +
 docs/tutorials/examples/check_digests.rst          |  38 +++
 run_tests.py                                       |  12 +-
 stem/__init__.py                                   |  15 +-
 stem/control.py                                    |  38 ++-
 stem/descriptor/__init__.py                        | 232 +++++++++++--
 stem/descriptor/extrainfo_descriptor.py            |  59 +++-
 stem/descriptor/hidden_service_descriptor.py       |   5 +-
 stem/descriptor/microdescriptor.py                 |  65 ++--
 stem/descriptor/networkstatus.py                   | 359 +++++++++++++++++----
 stem/descriptor/reader.py                          |   5 +
 stem/descriptor/remote.py                          | 173 ++++++++--
 stem/descriptor/router_status_entry.py             | 118 ++-----
 stem/descriptor/server_descriptor.py               | 105 +++---
 stem/descriptor/tordnsel.py                        |   2 +
 stem/util/system.py                                |   4 +-
 stem/version.py                                    |   2 +
 test/__init__.py                                   |   6 +-
 test/integ/descriptor/networkstatus.py             |   4 +-
 test/integ/util/connection.py                      |   2 +-
 test/integ/util/system.py                          |  21 +-
 test/require.py                                    |   2 +-
 test/settings.cfg                                  |   2 +
 test/task.py                                       |   9 +-
 test/unit/control/controller.py                    |  33 +-
 test/unit/descriptor/data/detached_signatures      | 171 ++++++++++
 test/unit/descriptor/descriptor.py                 |  51 +++
 test/unit/descriptor/extrainfo_descriptor.py       |   7 +-
 test/unit/descriptor/hidden_service_descriptor.py  |   1 +
 test/unit/descriptor/microdescriptor.py            |   3 +
 .../descriptor/networkstatus/bridge_document.py    |   1 +
 .../descriptor/networkstatus/detached_signature.py | 206 ++++++++++++
 test/unit/descriptor/networkstatus/document_v2.py  |   1 +
 test/unit/descriptor/networkstatus/document_v3.py  |  58 ++++
 .../descriptor/networkstatus/key_certificate.py    |   1 +
 test/unit/descriptor/remote.py                     |   2 +-
 test/unit/descriptor/router_status_entry.py        |  15 +
 test/unit/descriptor/server_descriptor.py          |  21 ++
 test/unit/descriptor/tordnsel.py                   |   2 +
 test/unit/doctest.py                               |  30 ++
 48 files changed, 1626 insertions(+), 371 deletions(-)

diff --cc stem/__init__.py
index 09188673,10a5d21b..019be855
--- a/stem/__init__.py
+++ b/stem/__init__.py
@@@ -488,7 -498,7 +498,7 @@@ Library for working with the tor proces
  import stem.util
  import stem.util.enum
  
- __version__ = '1.7.1'
 -__version__ = '1.7.0-dev'
++__version__ = '1.7.1-dev'
  __author__ = 'Damian Johnson'
  __contact__ = 'atagar@xxxxxxxxxxxxxx'
  __url__ = 'https://stem.torproject.org/'

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits