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

[teor at torproject.org]

commit 8ea0903222610b75e8b0c58297148267a299af31
Merge: 6ed56ee4e 0ab4dc7ef
Author: teor <teor at torproject.org>
Date:   Mon Aug 12 09:45:32 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/987' into maint-0.3.5

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