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

[nickm at torproject.org]

commit b84b008172027fbeeefed40015ab6cfeed98e567
Merge: 61330f40a fa70aabb6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Nov 8 14:49:16 2017 -0500

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

 src/or/dirvote.c | 9 ++++++++-
 src/or/dirvote.h | 7 +++++++
 2 files changed, 15 insertions(+), 1 deletion(-)