[tor-commits] [tor/master] Merge remote-tracking branch 'teor/test-network-hang-on-make-j2'

[nickm at torproject.org]

commit 40375fbce595b6279d5af5ecf7e6e46f43901558
Merge: 22a0708 c0794d2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 8 15:42:20 2014 -0400

    Merge remote-tracking branch 'teor/test-network-hang-on-make-j2'

 changes/bug13331-make-j2-test-network-hang |    3 +++
 src/test/test-network.sh                   |    5 +++++
 2 files changed, 8 insertions(+)