Merge branch 'ahf_bugs_21641_squashed'

changes/bug21641

src/or/config.c

src/or/main.c

src/or/or.h

src/or/router.c

src/or/router.h

src/test/test_dir.c