commit c6f35782d9a5698b49b15b6eca1299f726405720 Merge: 4b521fb e361caf Author: juga0 juga@riseup.net Date: Mon Mar 9 18:01:25 2020 +0000

Merge branch 'maint-1.1'

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 +- 9 files changed, 120887 insertions(+), 14 deletions(-)