Merge remote-tracking branch 'ahf-oniongit/bugs/24605'

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

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

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