[tor-commits] [tor/master] Merge remote-tracking branch 'public/ticket24849_032'

[nickm at torproject.org]

commit 80c8689be1d0b6d926752059b51966d398f7c184
Merge: 94878cf1e 75d4bd349
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 31 09:38:24 2018 -0500

    Merge remote-tracking branch 'public/ticket24849_032'

 changes/ticket24849 | 3 +++
 src/or/dirvote.c    | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)