[tor-commits] [tor/master] Merge branch 'bug23826-23828_squashed'

commit f50d64b62eeb7c07f2e0dd7f23499880d208a434 Merge: cf3da63b9 a2c09f675 Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 4 11:43:11 2017 -0500

Merge branch 'bug23826-23828_squashed'

changes/bug23826-23828 | 14 ++++++++++++++ doc/tor.1.txt | 26 +++++++++++++++++++++++--- src/or/dirserv.c | 19 ++++++++++++++----- src/or/dirserv.h | 1 + src/or/dirvote.c | 19 ++++++++++++++----- src/or/dirvote.h | 14 +++++++++++++- src/or/networkstatus.c | 4 +++- 7 files changed, 82 insertions(+), 15 deletions(-)