commit 685c9e7325794b8481edb5d3a3529bbf7e4d1085 Merge: 4106ade 2924e44 Author: Georg Koppen gk@torproject.org Date: Sat Aug 22 13:11:46 2020 +0000

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

sbws/lib/scaling.py | 10 +++++++--- sbws/lib/v3bwfile.py | 14 ++++++++++---- 2 files changed, 17 insertions(+), 7 deletions(-)