commit c59257d3787a452b34bc8c608c2c123929bdad0d Merge: 7ffc048 036966e Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 8 14:43:34 2015 -0400

Merge remote-tracking branch 'teor/make-test-network-all'

Makefile.am | 39 +++++++++++++++++++++++++++++++++++++-- src/test/include.am | 7 +++++++ src/test/test-network.sh | 6 +++--- 3 files changed, 47 insertions(+), 5 deletions(-)