commit 8fdd85b73315a5dd72de68c8a876ca9fe823fe7d Merge: 81d2bea f014084 Author: Georg Koppen gk@torproject.org Date: Mon Nov 30 10:02:29 2020 +0000

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

sbws/core/scanner.py | 3 ++- tests/integration/test_files.py | 7 +++++-- tests/unit/lib/test_heartbeat.py | 2 ++ tests/unit/lib/test_v3bwfile.py | 2 ++ 4 files changed, 11 insertions(+), 3 deletions(-)