commit 8a010c8b833dd5045e815c476afaf3632a8a29a3 Merge: de0babab9 d016bbaa7 Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 4 20:27:04 2019 -0400

Merge branch 'maint-0.4.0' into release-0.4.0

changes/bug29959-040 | 3 +++ src/feature/dirauth/dirvote.c | 21 ++++++++++----------- 2 files changed, 13 insertions(+), 11 deletions(-)