[tor-commits] [sbws/master] Merge remote-tracking branch 'gitlab/merge-requests/50' into maint-1.1

[juga at torproject.org]

commit c40e6e11f3d064f7c5fc8ec1895081ae673781fc
Merge: e37c472 cb6a8a7
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Jan 7 22:55:33 2021 +0000

    Merge remote-tracking branch 'gitlab/merge-requests/50' into maint-1.1

 docs/source/man_sbws.ini.rst  |  4 +++
 sbws/config.default.ini       |  1 +
 sbws/core/scanner.py          | 18 ++----------
 sbws/util/config.py           |  4 ++-
 sbws/util/stem.py             | 66 +++++++++++++++++++++----------------------
 tests/integration/conftest.py |  4 +--
 6 files changed, 45 insertions(+), 52 deletions(-)