[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/988' into maint-0.4.0

[nickm at torproject.org]

commit 6a6f7eb6718f22da80596a35e7774b075a417e97
Merge: d63c17f2a 821dd5458
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 5 16:22:52 2019 -0400

    Merge remote-tracking branch 'tor-github/pr/988' into maint-0.4.0

 changes/bug30316              |  4 ++++
 src/feature/dirauth/dirvote.c | 11 +++++------
 2 files changed, 9 insertions(+), 6 deletions(-)