Merge remote-tracking branch 'teor/feature17840-v11-merged-v2'

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

diff --cc src/common/address.c
Simple merge

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

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

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

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

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

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