[tor-commits] [tor/master] Merge branch 'tor-github/pr/988'

[dgoulet at torproject.org]

commit 327bb0e2ca72dd57bd1ceb9c05dd90dfffcc92a5
Merge: ebe39dcb9 821dd5458
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu May 23 09:30:36 2019 -0400

    Merge branch 'tor-github/pr/988'

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