commit 7556636ac2f76fb751a1a074b95c44b132fd05a3 Merge: 90fb57ec1 b84b00817 Author: Nick Mathewson nickm@torproject.org Date: Wed Nov 8 14:59:18 2017 -0500

Merge branch 'maint-0.3.2'

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