[tor-commits] [tor/master] Merge remote-tracking branch 'teor/feature14882-TestingDirAuthVoteIsStrict-v3'

[nickm at torproject.org]

commit 2f5202c6362408df5aad8f57f8dfffbafcbe0833
Merge: 988d208 3acb27a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 18 09:53:50 2015 -0400

    Merge remote-tracking branch 'teor/feature14882-TestingDirAuthVoteIsStrict-v3'

 changes/feature14882-TestingDirAuthVoteIsStrict |   18 ++
 doc/tor.1.txt                                   |   24 +-
 src/or/config.c                                 |    3 +
 src/or/dirserv.c                                |   48 ++--
 src/or/dirserv.h                                |    2 +
 src/or/or.h                                     |    5 +-
 src/test/test_dir.c                             |  277 +++++++++++++++++++++++
 7 files changed, 359 insertions(+), 18 deletions(-)