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