commit 128f7ffbc0cda7760b96b4d8eeda9550e2626f04 Merge: 5927ed8 9b9fb63 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Sep 6 14:27:13 2016 -0400 Merge remote-tracking branch 'public/ticket20002' changes/ticket20002 | 4 ++++ src/or/dirvote.c | 10 +++++++++- src/or/dirvote.h | 6 +++++- 3 files changed, 18 insertions(+), 2 deletions(-)