[tor-commits] [tor/master] Merge remote-tracking branch 'linus/bug8530'

[nickm at torproject.org]

commit f631b73cd5d97ff1eede5d57008ff7392c44a4bc
Merge: 0c3d676 538ca41
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Jun 29 16:02:13 2013 -0400

    Merge remote-tracking branch 'linus/bug8530'

 Makefile.am              |    5 +++++
 changes/bug8530          |    3 +++
 src/test/test-network.sh |   25 +++++++++++++++++++++++++
 3 files changed, 33 insertions(+)