commit 437cbb17c215e60cfd673d99e9c7ad729df6431a Merge: 476714e d875101 Author: Nick Mathewson <nickm@torproject.org> Date: Fri May 27 10:37:11 2016 -0400 Merge remote-tracking branch 'asn/feature19036' changes/feature19036 | 4 ++++ src/or/dirvote.c | 57 ++++++++++++++++++++++++++++++++++------------------ 2 files changed, 41 insertions(+), 20 deletions(-)