[tor-commits] [tor/master] Merge branch 'maint-0.3.0'

[nickm at torproject.org]

commit 8e3d929df7c497c83c2f34aae9fd9c88545072d3
Merge: 1cd7a69 a3bec9a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 28 20:14:06 2017 -0500

    Merge branch 'maint-0.3.0'

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