commit 88a8c2203e75d3bd4d68004262fe0174de1966ca Merge: ffd6e86 b9f9210 Author: Georg Koppen <gk@torproject.org> Date: Sun Aug 9 18:14:39 2020 +0000 Merge branch 'maint-1.1' into master AUTHORS.md | 7 +++- DEPLOY.rst | 14 +++---- INSTALL.rst | 2 +- README.md | 14 +++---- docs/source/contributing.rst | 73 ++++++++++++++++++++++--------------- docs/source/man_sbws.ini.rst | 2 +- docs/source/man_sbws.rst | 2 +- docs/source/tor_bandwidth_files.rst | 4 +- sbws/core/scanner.py | 4 +- sbws/lib/v3bwfile.py | 2 +- 10 files changed, 71 insertions(+), 53 deletions(-)