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

diff --cc bufferevent_pair.c
Simple merge

diff --cc event-internal.h
Simple merge

diff --cc evutil.c
Simple merge