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

Conflicts:
	evthread.c

diff --cc bufferevent_filter.c
Simple merge

diff --cc bufferevent_openssl.c
Simple merge

diff --cc bufferevent_sock.c
Simple merge

diff --cc configure.in
Simple merge

diff --cc evdns.c
Simple merge

diff --cc evthread.c
index a8b2534f32855a0a7432809295acd85ba9830547,2cfb76e9103d1a36e406277e5b4ffd98f54033a2..37621dd882c99db84fcfdae62537402f0db12baa
--- 1/evthread.c
--- 2/evthread.c
+++ b/evthread.c
@@@ -228,7 -217,7 +228,8 @@@ debug_cond_wait(void *_cond, void *_loc
  {
        int r;
        struct debug_lock *lock = _lock;
+       EVUTIL_ASSERT(lock);
 +      EVUTIL_ASSERT(DEBUG_LOCK_SIG == lock->signature);
        EVLOCK_ASSERT_LOCKED(_lock);
        evthread_debug_lock_mark_unlocked(0, lock);
        r = _original_cond_fns.wait_condition(_cond, lock->lock, tv);

diff --cc http.c
Simple merge

diff --cc test/regress_buffer.c
Simple merge