[tor-commits] [sbws/maint-1.1] Merge branch 'bug_33009_v6' into 'maint-1.1'

[juga at torproject.org]

commit 303342187dc164eb56f1a8d49ef859e69ae72c06
Merge: 3efb686 20df35c
Author: Juga <juga at torproject.org>
Date:   Tue Apr 14 13:47:57 2020 +0000

    Merge branch 'bug_33009_v6' into 'maint-1.1'
    
    Bug 33009 v6
    
    See merge request torproject/network-health/sbws!6

 sbws/core/scanner.py             |  6 ++++++
 sbws/lib/relaylist.py            | 35 +++++++++++++++++++++++++++++++++++
 tests/conftest.py                |  4 +++-
 tests/unit/lib/test_relaylist.py | 16 +++++++++++++---
 4 files changed, 57 insertions(+), 4 deletions(-)