Merge branch 'bug11946'

changes/bug11946

src/common/compat.c

src/common/compat.h

src/common/util.c

src/or/connection.c

src/or/control.c

src/or/main.c