Merge remote-tracking branch 'public/feature20552'

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

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

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