[tor-commits] [tor/maint-0.3.2] Merge remote-tracking branch 'dgoulet/bug24975_032_01' into maint-0.3.2

[nickm at torproject.org]

commit 1c39d969b99b7825a0e2f2db67efb0c0e19d7002
Merge: df312b3cf 3a247ca92
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 31 13:46:58 2018 -0500

    Merge remote-tracking branch 'dgoulet/bug24975_032_01' into maint-0.3.2

 changes/bug24975       |  6 ++++++
 src/or/networkstatus.c | 16 ++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)