Merge remote branch 'origin/patches-2.0'

diff --cc evdns.c
Simple merge

diff --cc evutil.c
Simple merge

diff --cc http.c
Simple merge

diff --cc select.c
Simple merge