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

Conflicts:
	Makefile.am
	WIN32-Code/event2/event-config.h
	configure.in

diff --cc Makefile.am
Simple merge

diff --cc WIN32-Code/event2/event-config.h
index 93b590a93b518e19eab3705ff9dfa543d4e9f3ef,144f0acc7ba1fa8959b08da0e7928dfd8aaf0153..f2ea1fcb980a58fed13e83e5090545395a31ea7c
--- 1/WIN32-Code/event2/event-config.h
--- 2/WIN32-Code/event2/event-config.h
+++ b/WIN32-Code/event2/event-config.h
@@@ -334,7 -334,7 +334,13 @@@
  #define _EVENT_TIME_WITH_SYS_TIME 1
  
  /* Version number of package */
++<<<<<<< HEAD
 +#define _EVENT_VERSION "2.1.0-alpha-dev"
++||||||| merged common ancestors
++#define _EVENT_VERSION "2.0.16-stable-dev"
++=======
+ #define _EVENT_VERSION "2.0.17-stable"
++>>>>>>> origin/patches-2.0
  
  /* Define to appropriate substitue if compiler doesnt have __func__ */
  #define _EVENT___func__ __FUNCTION__

diff --cc arc4random.c
Simple merge

diff --cc buffer.c
Simple merge

diff --cc buffer_iocp.c
Simple merge

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_pair.c
Simple merge

diff --cc bufferevent_ratelim.c
Simple merge

diff --cc bufferevent_sock.c
Simple merge

diff --cc configure.in
index b60669baefd17a9e6d29e4662e0bc200ceebe7eb,d61390bd68c6c7b76d4595cc1b6430fba5359544..0e2770feee0427bf6c3c760d587ee8f979aa9c96
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -1,6 -1,12 +1,11 @@@
--dnl configure.in for libevent
- dnl Dug Song <dugsong@monkey.org>
+ dnl Copyright 2000-2007 Niels Provos
+ dnl Copyright 2007-2012 Niels Provos and Nick Mathewson
+ dnl
+ dnl See LICENSE for copying information.
+ dnl
+ dnl Original version Dug Song <dugsong@monkey.org>
+ 
 -AC_PREREQ(2.59c)
 +AC_PREREQ(2.59)
  AC_INIT(event.c)
  
  AC_CONFIG_MACRO_DIR([m4])

diff --cc defer-internal.h
Simple merge

diff --cc devpoll.c
Simple merge

diff --cc epoll.c
Simple merge

diff --cc epoll_sub.c
Simple merge

diff --cc evbuffer-internal.h
Simple merge

diff --cc evdns.c
Simple merge

diff --cc event-internal.h
Simple merge

diff --cc event.c
Simple merge

diff --cc event.h
Simple merge

diff --cc event_iocp.c
Simple merge

diff --cc event_tagging.c
Simple merge

diff --cc evmap-internal.h
Simple merge

diff --cc evmap.c
Simple merge

diff --cc evport.c
Simple merge

diff --cc evrpc.c
Simple merge

diff --cc evthread-internal.h
Simple merge

diff --cc evthread.c
Simple merge

diff --cc evthread_pthread.c
Simple merge

diff --cc evthread_win32.c
Simple merge

diff --cc evutil.c
Simple merge

diff --cc evutil_rand.c
Simple merge

diff --cc http-internal.h
Simple merge

diff --cc http.c
Simple merge

diff --cc include/event2/buffer.h
Simple merge

diff --cc include/event2/bufferevent.h
Simple merge

diff --cc include/event2/bufferevent_ssl.h
Simple merge

diff --cc include/event2/dns.h
Simple merge

diff --cc include/event2/dns_compat.h
Simple merge

diff --cc include/event2/event.h
Simple merge

diff --cc include/event2/event_struct.h
Simple merge

diff --cc include/event2/http.h
Simple merge

diff --cc include/event2/listener.h
Simple merge

diff --cc include/event2/rpc.h
Simple merge

diff --cc include/event2/thread.h
Simple merge

diff --cc include/event2/util.h
Simple merge

diff --cc iocp-internal.h
Simple merge

diff --cc ipv6-internal.h
Simple merge

diff --cc kqueue.c
Simple merge

diff --cc listener.c
Simple merge

diff --cc log-internal.h
Simple merge

diff --cc log.c
Simple merge

diff --cc minheap-internal.h
Simple merge

diff --cc mm-internal.h
Simple merge

diff --cc poll.c
Simple merge

diff --cc sample/Makefile.am
Simple merge

diff --cc select.c
Simple merge

diff --cc signal.c
Simple merge

diff --cc test/bench.c
Simple merge

diff --cc test/bench_cascade.c
Simple merge

diff --cc test/bench_http.c
Simple merge

diff --cc test/bench_httpclient.c
Simple merge

diff --cc test/regress.c
Simple merge

diff --cc test/regress.h
Simple merge

diff --cc test/regress_buffer.c
Simple merge

diff --cc test/regress_bufferevent.c
Simple merge

diff --cc test/regress_dns.c
Simple merge

diff --cc test/regress_et.c
Simple merge

diff --cc test/regress_http.c
Simple merge

diff --cc test/regress_listener.c
Simple merge

diff --cc test/regress_main.c
Simple merge

diff --cc test/regress_minheap.c
Simple merge

diff --cc test/regress_rpc.c
Simple merge

diff --cc test/regress_ssl.c
Simple merge

diff --cc test/regress_testutils.c
Simple merge

diff --cc test/regress_thread.c
Simple merge

diff --cc test/regress_util.c
Simple merge

diff --cc test/regress_zlib.c
Simple merge

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

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

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

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

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

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

diff --cc test/tinytest.c
Simple merge

diff --cc util-internal.h
Simple merge

diff --cc win32select.c
Simple merge