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

[nickm at torproject.org]

commit 72751f0c304247e60417935bf980c8cb081bf15c
Merge: c5da1f1cd c346eff22
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 5 11:53:31 2019 -0500

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

 changes/ticket29060      |  2 ++
 src/test/test-network.sh | 22 +++++++++-------------
 2 files changed, 11 insertions(+), 13 deletions(-)