commit 8b6b36312067703df48047ba8f148b4ef664e07b Merge: e6f5f98 685c9e7 Author: Georg Koppen gk@torproject.org Date: Sat Aug 22 13:12:17 2020 +0000

Merge branch 'maint-1.1' into master

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