[tor-commits] [sbws/master] Merge pull request #191 from pastly/issue155

[pastly at torproject.org]

commit cf3e47851895617bfd173c9154526290a1fcd7d3
Merge: 104fbe7 467f98a
Author: juga0 <juga at riseup.net>
Date:   Sat Jun 23 18:22:28 2018 +0000

    Merge pull request #191 from pastly/issue155
    
    Implement the "MaxAdvertisedBandwidth" hack ...

 CHANGELOG.md                           |   2 +
 sbws/globals.py                        |   2 +-
 sbws/lib/resultdump.py                 |  14 +-
 sbws/lib/v3bwfile.py                   |  20 ++-
 scripts/tools/sbws-http-server.py      |  76 +++++++++
 tests/integration/core/test_scanner.py |  92 +++++++++++
 tests/integration/net.tar              | Bin 191488 -> 215040 bytes
 tests/unit/core/test_generate.py       | 284 ---------------------------------
 tests/unit/lib/data/results.txt        |   4 +-
 tests/unit/lib/test_results.py         |   4 +-
 tests/unit/lib/test_v3bwfile.py        |   3 +-
 tox.ini                                |   5 +-
 12 files changed, 212 insertions(+), 294 deletions(-)