[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug19699'

[nickm at torproject.org]

commit 2c8d2cab13f8acf35cebc467b3607d04b9f87a4b
Merge: 0a54e5d d784236
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 6 11:52:17 2017 -0500

    Merge remote-tracking branch 'teor/bug19699'

 changes/bug19699         |   5 ++
 src/test/test-network.sh | 185 ++++++++++-------------------------------------
 2 files changed, 45 insertions(+), 145 deletions(-)