commit f9ba0b76cd5b447b86efa87eb115d12d6f0be2e7 Merge: d777631 8a8797f Author: Nick Mathewson nickm@torproject.org Date: Tue Dec 23 14:25:37 2014 -0500

Merge remote-tracking branch 'teor/bug13718-consensus-interval'

changes/bug13823-decrease-consensus-interval | 8 +++ changes/bug13839-fix-TestingMinExitFlagThreshold | 7 ++ changes/bug13963-decrease-if-modified-since-delay | 7 ++ src/or/config.c | 78 +++++++++++++++++---- src/or/directory.c | 27 +++++-- src/or/dirserv.c | 24 +++++-- src/or/dirvote.c | 8 ++- src/or/dirvote.h | 32 ++++++++- src/or/networkstatus.c | 12 ++++ src/or/router.c | 13 +++- src/or/routerlist.c | 22 +++++- src/or/routerparse.c | 8 ++- 12 files changed, 216 insertions(+), 30 deletions(-)