Merge branch 'bug23826-23828_squashed'

diff --cc doc/tor.1.txt
Simple merge

diff --cc src/or/dirserv.c
Simple merge

diff --cc src/or/dirvote.c
Simple merge

diff --cc src/or/dirvote.h
Simple merge

diff --cc src/or/networkstatus.c
Simple merge