Merge branch 'bug11396_v2_squashed'

changes/bug11396

configure.ac

doc/tor.1.txt

src/common/compat.c

src/common/compat.h

src/or/config.c

src/or/control.c

src/or/main.c

src/or/or.h

src/test/test_util.c