Merge remote-tracking branch 'public/bug4533_part1'

changes/tor_socket_tests

src/common/compat.c

src/common/compat.h

src/or/buffers.c

src/or/connection.c

src/or/cpuworker.c

src/or/dns.c