Merge branch 'bug2972' into maint-0.2.2

changes/bug2792_checkdir

changes/bug2972

doc/tor.1.txt

src/common/compat.c

src/common/compat.h

src/common/util.c

src/common/util.h

src/or/config.c

src/or/connection.c

src/or/or.h

src/test/test_util.c