commit 19fa738e2ffe7c0f3cd27122003c31f5baa80e24 Merge: 8dbe890 225d880 Author: juga0 <j...@riseup.net> Date: Wed Jan 23 15:20:22 2019 +0000
Merge branch 'bug28741' There was merge conflict in the imports, solved adding all of them sbws/__init__.py | 17 +++++++++++++++++ sbws/core/scanner.py | 34 ++++++++++++++++++++++++++-------- sbws/globals.py | 33 +++++++++++++++++++++++++++++++++ sbws/lib/destination.py | 2 +- sbws/util/requests.py | 15 +++++---------- 5 files changed, 82 insertions(+), 19 deletions(-) diff --cc sbws/core/scanner.py index edf5227,a6e46a4..8fe8a5b --- a/sbws/core/scanner.py +++ b/sbws/core/scanner.py @@@ -1,7 -1,6 +1,8 @@@ ''' Measure the relays. ''' +import sys +import threading + import uuid from ..lib.circuitbuilder import GapsCircuitBuilder as CB from ..lib.resultdump import ResultDump @@@ -12,7 -11,7 +13,7 @@@ from ..lib.relayprioritizer import Rela from ..lib.destination import DestinationList from ..util.timestamp import now_isodt_str from ..util.state import State - from sbws.globals import fail_hard, TIMEOUT_MEASUREMENTS -from sbws.globals import fail_hard, HTTP_GET_HEADERS ++from sbws.globals import fail_hard, TIMEOUT_MEASUREMENTS, HTTP_GET_HEADERS import sbws.util.stem as stem_utils import sbws.util.requests as requests_utils from argparse import ArgumentDefaultsHelpFormatter _______________________________________________ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits