[tor-commits] [tor/master] Merge remote-tracking branch 'arma/bug18840'

[nickm at torproject.org]

commit 476714e1a4b18d4beaa8aa6e0c6b8939efbf2f9f
Merge: 3934e78 5a83122
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri May 27 10:35:55 2016 -0400

    Merge remote-tracking branch 'arma/bug18840'

 changes/bug18840 | 4 ++++
 src/or/dirvote.c | 1 +
 2 files changed, 5 insertions(+)