Merge remote-tracking branch 'origin/patches-2.0'

diff --cc evdns.c
Simple merge

diff --cc test/regress_dns.c
Simple merge

diff --cc test/regress_testutils.c
Simple merge