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

diff --cc bufferevent-internal.h
Simple merge

diff --cc bufferevent.c
Simple merge

diff --cc bufferevent_async.c
Simple merge

diff --cc bufferevent_filter.c
Simple merge

diff --cc bufferevent_openssl.c
Simple merge

diff --cc bufferevent_ratelim.c
Simple merge

diff --cc bufferevent_sock.c
Simple merge

diff --cc test/test-ratelim.c
Simple merge