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

[nickm at torproject.org]

commit 4808540d5c8e132c6ea4db13e25faff6446dc674
Merge: b6a9be0 eef8bd4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 27 11:36:56 2017 -0500

    Merge branch 'maint-0.3.0'

 Makefile.am              |  5 +++++
 changes/bug21562         |  4 ++++
 changes/feature21570     |  5 +++++
 src/test/test-network.sh | 47 ++++++++++++++++++++++++++---------------------
 4 files changed, 40 insertions(+), 21 deletions(-)