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

[juga at torproject.org]

commit b9c67d4e4a4e7d72303e6d66c86fd166c7e00700
Merge: 0e37b0e f9e4549
Author: juga0 <juga at riseup.net>
Date:   Fri Feb 26 10:17:45 2021 +0000

    Merge branch 'maint-1.1'

 docs/Makefile                                      |   6 +
 docs/source/activity_aggr_file.puml                |  27 ++
 docs/source/activity_aggr_lines.puml               |  36 ++
 docs/source/activity_scaling_as_torflow.puml       |  35 ++
 docs/source/activity_torflow_aggr.puml             |  64 +++
 docs/source/activity_torflow_scaling.puml          | 168 +++++++
 .../activity_torflow_scaling_simplified.puml       | 132 ++++++
 .../activity_torflow_scaling_simplified1.puml      |  38 ++
 docs/source/differences.rst                        |  51 +++
 docs/source/generator.rst                          |  64 +++
 docs/source/how_works.rst                          |  64 +--
 docs/source/images/activity_aggr_file.svg          |  40 ++
 docs/source/images/activity_aggr_lines.svg         |  49 +++
 docs/source/images/activity_scaling_as_torflow.svg |  47 ++
 docs/source/images/activity_torflow_aggr.svg       |  52 +++
 docs/source/images/activity_torflow_scaling.svg    | 169 +++++++
 .../images/activity_torflow_scaling_simplified.svg | 138 ++++++
 .../activity_torflow_scaling_simplified1.svg       |  47 ++
 docs/source/index.rst                              |   4 +-
 docs/source/torflow_aggr.rst                       | 487 +++++++++++----------
 20 files changed, 1439 insertions(+), 279 deletions(-)