commit b0c67fd711e87b7ea004cc6fafc65cdca734aad1 Merge: b4cfac8 b250571 Author: juga0 juga@riseup.net Date: Fri Dec 21 09:13:25 2018 +0000

Merge branch 'bug28736'

sbws/config.default.ini | 2 +- sbws/config.log.default.ini | 3 ++ sbws/core/scanner.py | 95 ++++++++++++++++++++++++++------------------ sbws/lib/circuitbuilder.py | 14 +++++-- sbws/lib/destination.py | 5 ++- sbws/lib/relayprioritizer.py | 11 ++--- sbws/lib/resultdump.py | 15 ++++++- sbws/util/stem.py | 2 + 8 files changed, 94 insertions(+), 53 deletions(-)