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

[juga at torproject.org]

commit 748cf1c1f347b89eaab625bdebd9314dadaccc8e
Merge: c5fe10e a914215
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Jul 10 23:10:23 2020 +0000

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

 sbws/lib/v3bwfile.py            | 30 ++++++++++++++++++------------
 tests/unit/lib/data/results.txt |  2 +-
 2 files changed, 19 insertions(+), 13 deletions(-)