commit 48d7b693022e911899f1798386a2f5e277512cb2 Merge: 39375db 77d14b5 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Oct 26 16:40:11 2016 -0400 Merge branch 'ticket14881-v3' changes/14881 | 7 ++ src/or/dirvote.c | 14 +++- src/or/dirvote.h | 10 ++- src/test/test_dir.c | 230 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 258 insertions(+), 3 deletions(-)