[tor-commits] [tor/master] Merge remote-tracking branch 'teor/feature21570-030' into maint-0.3.0

[nickm at torproject.org]

commit eef8bd4d3c49bf093f11bf6fa81bfd8561f02fc5
Merge: c51919b 73879aa
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 27 11:36:39 2017 -0500

    Merge remote-tracking branch 'teor/feature21570-030' into 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(-)