[tor-commits] [tor/master] Merge remote-tracking branch 'teor/feature14175-chutney-performance-v2'

[nickm at torproject.org]

commit 8b1f88eded2b047eef9be9e16d6bf90b0f01bfd0
Merge: 0dab1bc 128d4a6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 29 10:36:23 2015 -0400

    Merge remote-tracking branch 'teor/feature14175-chutney-performance-v2'

 changes/feature14175-chutney-performance |    9 +++++++++
 src/test/test-network.sh                 |   21 +++++++++++++++++++++
 2 files changed, 30 insertions(+)