[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm at torproject.org]

commit 909493604072e371d05d622a9ee1554e6cb7313b
Merge: cf9844f a3bec9a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 28 20:13:54 2017 -0500

    Merge branch 'maint-0.3.0' into release-0.3.0

 Makefile.am              |  3 ---
 changes/bug21581         |  5 +++++
 src/test/test-network.sh | 19 ++++++++++++++++---
 3 files changed, 21 insertions(+), 6 deletions(-)