Merge branch 'feature9503_squashed'

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

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

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