commit d016bbaa7dfb3586c682c0070b79e174e8a73c19 Merge: 42aae0e69 8e961b217 Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 4 20:26:47 2019 -0400

Merge branch 'bug29959_040_squashed' into maint-0.4.0

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