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

[nickm at torproject.org]

commit 93bd60e5b01beccbc0b5ac7c46d95660624f4ad6
Merge: 0dc7d68 2251667
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 5 17:00:46 2017 -0400

    Merge branch 'maint-0.3.1'

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