commit 8b3580255d7b653cc20476c4294b2e47af351f79
Merge: 1cc344b27 03b18f628
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 21 13:57:48 2017 -0500
    Merge remote-tracking branch 'teor/bug24372'
 src/or/dirvote.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)