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

[juga at torproject.org]

commit c89a8a35989773ac4da249b5f8f6138ed528dd4e
Merge: 44489f3 02861e1
Author: juga0 <juga at riseup.net>
Date:   Mon Jun 29 07:49:48 2020 +0000

    Merge branch 'maint-1.1'

 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(-)