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

[nickm at torproject.org]

commit c01c6123fa0ef207ca55f6ce9b4896b1f3de8b15
Merge: 1c9b62928 4773fa647
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 12 11:05:27 2019 -0400

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

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