[tor-commits] [chutney/master] Merge remote-tracking branch 'tor-github/pr/75'

[nickm at torproject.org]

commit 3a12f3c6c85520f052c255c20e9738c707674601
Merge: d2c04fa 54f4243
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 24 10:07:19 2020 -0400

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

 lib/chutney/TorNet.py | 68 ++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 48 insertions(+), 20 deletions(-)