[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

[nickm at torproject.org]

commit c5b16c141336025908ccc420b7a4f4b3fc38a7cb
Merge: 388b1d0fa b84b00817
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Nov 8 14:59:18 2017 -0500

    Merge branch 'maint-0.3.2' into release-0.3.2

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