commit ea5ea5f5542b314d3365a09427cf74340b5093e4 Merge: 91e82baa8 c58471325 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Nov 7 14:01:10 2017 -0500 Merge branch 'maint-0.3.2' src/or/dirvote.c | 7 +++++++ src/or/networkstatus.c | 8 ++++++-- 2 files changed, 13 insertions(+), 2 deletions(-)