commit 733c44581faa3356740f75f78dfdefc3015d0d8d Merge: 3ad3b90 09dc71a Author: teor teor@torproject.org Date: Fri Jan 24 10:26:11 2020 +1000

Merge remote-tracking branch 'tor-github/pr/48'

lib/chutney/TorNet.py | 6 +++++- tools/bootstrap-network.sh | 25 +++++++++++++++++-------- tools/hsaddress.sh | 25 +++++++++++++++++-------- tools/warnings.sh | 25 +++++++++++++++++-------- 4 files changed, 56 insertions(+), 25 deletions(-)