Merge branch 'ticket22029_attempt_squashed'

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

diff --cc src/feature/dirauth/process_descs.c
Simple merge

diff --cc src/feature/dirauth/process_descs.h
Simple merge

diff --cc src/feature/nodelist/routerlist.c
Simple merge

diff --cc src/feature/relay/router.c
Simple merge

diff --cc src/test/test_dir.c
Simple merge