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

[nickm at torproject.org]

commit 7b2357a37ab0c0293aad3eb185414f086bbe44d9
Merge: 9ae267538 a549e4f7a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 16 08:08:06 2019 -0400

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

 src/test/test-network.sh | 34 ++++++++--------------------------
 1 file changed, 8 insertions(+), 26 deletions(-)