commit 09ea0377ba1b6ed7892aec777640729f494afce8 Merge: 2a08a7b 0fb0128 Author: juga0 juga@riseup.net Date: Sat Feb 23 10:55:43 2019 +0000

Merge branch 'bug29149_squashed'

Solved conflicts: docs/source/specification.rst

INSTALL.rst | 2 +- README.md | 2 +- docs/source/activity_all.puml | 25 + docs/source/activity_second_relay.puml | 30 + docs/source/bandwidth_authorities.rst | 28 + docs/source/bandwidth_distribution.rst | 38 + docs/source/classes_original.puml | 220 +++ docs/source/code_design.rst | 60 + docs/source/conf.py | 5 +- docs/source/config.rst | 8 +- docs/source/config_tor.rst | 41 +- docs/source/data/critical_sections.dia | Bin 0 -> 3540 bytes docs/source/data/scanner.dia | Bin 0 -> 1997 bytes docs/source/data/use_cases_data_sources.dia | Bin 0 -> 1743 bytes docs/source/diagrams.rst | 16 - docs/source/documenting.rst | 4 +- docs/source/how_works.rst | 158 ++ docs/source/images/20180901_163442.png | Bin 0 -> 38517 bytes docs/source/images/20180901_164014.png | Bin 0 -> 43522 bytes ...710932-ac1eeea8-9960-11e8-9e7e-21fddff2f7a3.png | Bin 0 -> 38367 bytes ...710933-ac95e0bc-9960-11e8-9aaf-0bb1f83b65e2.png | Bin 0 -> 33525 bytes docs/source/images/activity_all.svg | 1 + docs/source/images/activity_second_relay.svg | 1 + docs/source/images/advertised_bandwidth.png | Bin 0 -> 58213 bytes docs/source/images/bwauth.svg | 1570 ++++++++++++++++++++ docs/source/images/bwauth_measured_7days.png | Bin 0 -> 28457 bytes docs/source/images/bwauth_measured_90days.png | Bin 0 -> 52889 bytes docs/source/images/classes_original.svg | 1 + docs/source/images/classes_sbws.svg | 246 --- docs/source/images/critical_sections.svg | 516 +++++++ docs/source/images/pycallgraph.png | Bin 0 -> 381993 bytes docs/source/images/scanner.svg | 248 ++++ docs/source/images/threads.svg | 1 + docs/source/images/torperf.png | Bin 0 -> 99045 bytes docs/source/images/totalcw.png | Bin 0 -> 81651 bytes docs/source/images/use_cases_classes.svg | 401 +++++ docs/source/images/use_cases_data_sources.svg | 291 ++++ docs/source/index.rst | 16 +- docs/source/monitoring_bandwidth.rst | 35 + docs/source/sbws.rst | 2 +- docs/source/specification.rst | 167 --- docs/source/state.rst | 2 + docs/source/threads.puml | 23 + docs/source/tor_bandwidth_files.rst | 32 + sbws/core/scanner.py | 7 + 45 files changed, 3741 insertions(+), 456 deletions(-)