Merge remote-tracking branch 'public/bug5124'

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

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

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