commit 02861e103119b17821e78fcacbcfdf24f568ec69 Merge: 3033421 ce0449a Author: Georg Koppen gk@torproject.org Date: Mon Jun 15 07:14:43 2020 +0000

Merge branch 'maint-1.1_bug33871_scaling_03' into 'maint-1.1'

Maint 1.1 bug33871 scaling 03

See merge request tpo/network-health/sbws!9

docs/source/index.rst | 1 + docs/source/torflow_aggr.rst | 429 +++++++++++++++++++++ sbws/lib/bwfile_health.py | 2 + sbws/lib/scaling.py | 19 + sbws/lib/v3bwfile.py | 386 ++++++++---------- tests/conftest.py | 1 + tests/unit/lib/data/results_0_consensus_bw.txt | 1 + tests/unit/lib/data/results_no_consensus_bw.txt | 1 + tests/unit/lib/data/results_no_desc_bw_avg.txt | 1 + tests/unit/lib/data/results_no_desc_bw_avg_obs.txt | 1 + tests/unit/lib/data/results_no_desc_bw_obs.txt | 1 + tests/unit/lib/test_scaling.py | 13 + tests/unit/lib/test_v3bwfile.py | 49 ++- 13 files changed, 680 insertions(+), 225 deletions(-)