[tor-commits] [sbws/master] Merge branch 'bug28866'

[juga at torproject.org]

commit 901cf9216c8df054d05fd51315b51ec14128ac49
Merge: cbe6817 cf5b324
Author: juga0 <juga at riseup.net>
Date:   Sun Mar 3 12:44:14 2019 +0000

    Merge branch 'bug28866'

 sbws/core/scanner.py            | 16 +++++++++++++++-
 sbws/lib/resultdump.py          | 17 ++++++++++++++++-
 tests/unit/conftest.py          | 20 ++++++++++++++++++++
 tests/unit/core/test_scanner.py | 28 ++++++++++++++++++++++++++++
 4 files changed, 79 insertions(+), 2 deletions(-)

diff --cc sbws/core/scanner.py
index 3fbd378,7ab1e6e..4ad2cb5
--- a/sbws/core/scanner.py
+++ b/sbws/core/scanner.py
@@@ -1,11 -1,6 +1,12 @@@
  ''' Measure the relays. '''
+ import queue
  
 +import signal
 +import sys
 +import threading
 +import traceback
 +import uuid
 +
  from ..lib.circuitbuilder import GapsCircuitBuilder as CB
  from ..lib.resultdump import ResultDump
  from ..lib.resultdump import ResultSuccess, ResultErrorCircuit