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

[nickm at torproject.org]

commit 02030009c5b150fe4cb3d46e0c4fab09e9654de7
Merge: adae5d3 2251667
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 5 17:00:46 2017 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1

 changes/task-22207     |  4 ++++
 src/or/networkstatus.c | 14 ++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)