[tor-commits] [tor/master] Merge branch 'feature19116_squashed'

commit 9de9f2d48ba0c4953df1f19992a45b33ea841e17 Merge: d70fac1 bf2f7c2 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jul 26 19:21:04 2016 -0400 Merge branch 'feature19116_squashed' src/test/test-network.sh | 152 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 124 insertions(+), 28 deletions(-)