[tor-commits] [sbws/maint-1.1] Merge branch 'maint-1.1_bug33570_consensus_ts' into maint-1.1

[juga at torproject.org]

commit e361caf804a079665a1810279b00ff94bb60b253
Merge: 5530225 b3a84ee
Author: juga0 <juga at riseup.net>
Date:   Mon Mar 9 18:00:08 2020 +0000

    Merge branch 'maint-1.1_bug33570_consensus_ts' into maint-1.1

 docs/source/how_works.rst                |     2 +
 docs/source/images/dirauths_bwauths.png  |   Bin 0 -> 157949 bytes
 sbws/lib/relaylist.py                    |    15 +-
 sbws/util/timestamp.py                   |     6 +-
 setup.py                                 |     2 +-
 tests/conftest.py                        |    60 +-
 tests/data/2020-02-29-10-00-00-consensus | 39974 ++++++++++++++++++++++++++++
 tests/data/2020-02-29-11-00-00-consensus | 40144 ++++++++++++++++++++++++++++
 tests/data/2020-03-05-10-00-00-consensus | 40609 +++++++++++++++++++++++++++++
 tests/unit/lib/test_relaylist.py         |    75 +
 tests/unit/util/test_timestamp.py        |    16 +-
 11 files changed, 120889 insertions(+), 14 deletions(-)