commit 01482e30ad8a453f3721ef17a4a9633806b90684 Merge: 410f1a4 5503eec Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 24 12:47:29 2016 -0400

Merge remote-tracking branch 'pastly/ticket20273'

changes/20273 | 4 ++++ src/or/dirvote.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-)