[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

[nickm at torproject.org]

commit 0e7b34354a1789ff3b2d39a98ca8ebcb37ef4664
Merge: 0b6769a99 d016bbaa7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 4 20:27:04 2019 -0400

    Merge branch 'maint-0.4.0'

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