[tor-commits] [sbws/master] Merge branch 'maint-1.1'

[juga at torproject.org]

commit 0001f1a5f6c91d5c4672db12082c63708e31512b
Merge: 383cf4f 748cf1c
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Jul 10 23:11:11 2020 +0000

    Merge branch 'maint-1.1'

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