Merge remote-tracking branch 'public/bug10363_024_squashed'

diff --cc src/common/compat.c
Simple merge

diff --cc src/ext/eventdns.c
Simple merge

diff --cc src/or/channeltls.c
Simple merge

diff --cc src/test/test_util.c
Simple merge