[tor-commits] [tor/master] Merge branch 'ticket26014'

[nickm at torproject.org]

commit a1a32b483412deda5b7573c3120c85fe41e3dfd2
Merge: fd1d0a7d2 d14c245a0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 7 12:07:53 2018 -0400

    Merge branch 'ticket26014'

 changes/ticket26014             |  4 +++
 src/or/voting_schedule.c        |  2 ++
 src/test/include.am             |  1 +
 src/test/test.c                 |  1 +
 src/test/test.h                 |  1 +
 src/test/test_voting_schedule.c | 64 +++++++++++++++++++++++++++++++++++++++++
 6 files changed, 73 insertions(+)