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

commit 59f3cce0dcddb98301d18d0cb4cb08c1619fa34c Merge: 4af88d6 607724c Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 9 11:51:18 2014 -0400

Merge branch 'bug12899_squashed'

changes/bug12899 | 7 ++ doc/tor.1.txt | 25 ---- src/or/config.c | 4 +- src/or/connection_or.c | 17 +-- src/or/dirserv.c | 294 ++++++++++-------------------------------------- src/or/dirserv.h | 3 +- src/or/dirvote.h | 2 +- src/or/networkstatus.c | 2 +- src/or/or.h | 4 - src/or/router.c | 5 +- src/test/test_dir.c | 4 +- 11 files changed, 83 insertions(+), 284 deletions(-)