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

diff --cc evutil.c
Simple merge

diff --cc listener.c
index c8f342827f5b5332e419b2bfcdf9071d51b63e02,2b67b525e24d962295857c318311f3e95225df32..3272c405ce6eeea844ccbde42c0632d32d7b49d1
--- 1/listener.c
--- 2/listener.c
+++ b/listener.c
@@@ -401,7 -403,11 +401,8 @@@ listener_read_cb(evutil_socket_t fd, sh
                        continue;
                }
  
 -              if (!(lev->flags & LEV_OPT_LEAVE_SOCKETS_BLOCKING))
 -                      evutil_make_socket_nonblocking(new_fd);
 -
                if (lev->cb == NULL) {
+                       evutil_closesocket(new_fd);
                        UNLOCK(lev);
                        return;
                }