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

commit c58471325a48f8181d32d45ef75cd23ffd942181 Merge: c7d1d1ad2 e67f4441e Author: Nick Mathewson <nickm@torproject.org> Date: Tue Nov 7 14:00:18 2017 -0500 Merge remote-tracking branch 'dgoulet/bug24161_032_01' into maint-0.3.2 src/or/dirvote.c | 7 +++++++ src/or/networkstatus.c | 8 ++++++-- 2 files changed, 13 insertions(+), 2 deletions(-)