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

[juga at torproject.org]

commit 279874f4f4ef90f50b87580cd347b6b2ce62c390
Merge: cde8950 fc3d3b9
Author: Georg Koppen <gk at torproject.org>
Date:   Tue Mar 16 13:07:48 2021 +0000

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

 docs/source/torflow_aggr.rst   | 25 ++++++++++++++++++
 sbws/globals.py                |  8 ++++++
 sbws/lib/scaling.py            | 40 +++++++++++++++++++++++++----
 sbws/lib/v3bwfile.py           | 31 ++++++++++++++--------
 sbws/util/stem.py              | 22 +++++++++++++++-
 tests/unit/lib/test_scaling.py | 58 +++++++++++++++++++++++++++++++++++++++++-
 6 files changed, 166 insertions(+), 18 deletions(-)