Merge branch 'maint-0.3.3'

changes/ticket24343

doc/tor.1.txt

src/or/config.c

src/or/connection.c

src/or/main.c

src/or/or.h