commit 692e1facc656814b26240d8fd80f3fc2c7f7e672 Merge: 1bb248b 6070d36 Author: juga0 juga@riseup.net Date: Thu Mar 21 18:17:51 2019 +0000

Merge branch 'master' into HEAD

There was an ammended commit diverging from canonical master

CONTRIBUTING.rst | 2 +- README.md | 14 +- docs/source/examples/sbws.example.ini | 4 + docs/source/how_works.rst | 19 +- sbws/__init__.py | 2 +- sbws/core/scanner.py | 183 ++++++--- sbws/globals.py | 29 +- sbws/lib/destination.py | 184 ++++++++-- sbws/lib/relaylist.py | 251 ++++++++++++- sbws/lib/relayprioritizer.py | 35 ++ sbws/lib/resultdump.py | 245 +++++++++++-- sbws/lib/v3bwfile.py | 490 +++++++++++++++++++++---- sbws/util/config.py | 6 +- sbws/util/state.py | 9 +- sbws/util/timestamp.py | 4 + tests/integration/lib/test_destination.py | 52 +-- tests/integration/lib/test_relaylist.py | 5 + tests/integration/lib/test_relayprioritizer.py | 1 + tests/integration/util/test_requests.py | 6 - tests/unit/conftest.py | 4 +- tests/unit/lib/data/results.txt | 4 +- tests/unit/lib/test_destination.py | 54 +++ tests/unit/lib/test_v3bwfile.py | 83 ++++- 23 files changed, 1432 insertions(+), 254 deletions(-)