Merge remote-tracking branch 'public/feature_13822'

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

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

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