Merge branch 'ahf_bugs_21641_squashed'

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

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

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

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

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

diff --cc src/test/test_dir.c
Simple merge