commit eb01f35149d9222922fee2bb51a6246d58f7d25f Merge: c7d2a67 67b6ba6 Author: Nick Mathewson nickm@torproject.org Date: Fri Jul 7 13:03:36 2017 -0400

Merge branch 'bug21495'

src/or/dirvote.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)