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

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

diff --cc Makefile.am
index 749d4427c46b41675508b1241ad5bd09fb3b26ab,bf3ae50084796269ad3e39737000001baa6d96e7..dae46c247ca48c1c012616e174dc54d8638a4ca3
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -32,9 -32,23 +32,23 @@@ RELEASE = -release 2.
  #
  # Once an RC is out, DO NOT MAKE ANY ABI-BREAKING CHANGES IN THAT SERIES
  # UNLESS YOU REALLY REALLY HAVE TO.
 -VERSION_INFO = 6:1:1
 +VERSION_INFO = 1:0:0
  
  # History:          RELEASE    VERSION_INFO
+ #  2.0.1-alpha --     2.0        1:0:0
+ #  2.0.2-alpha --                2:0:0
+ #  2.0.3-alpha --                2:0:0  (should have incremented; didn't.)
+ #  2.0.4-alpha --                3:0:0
+ #  2.0.5-beta  --                4:0:0
+ #  2.0.6-rc    --     2.0        2:0:0
+ #  2.0.7-rc    --     2.0        3:0:1
+ #  2.0.8-rc    --     2.0        4:0:2
+ #  2.0.9-rc    --     2.0        5:0:0 (ABI changed slightly)
+ #  2.0.10-stable--    2.0        5:1:0 (No ABI change)
+ #  2.0.11-stable--    2.0        6:0:1 (ABI changed, backward-compatible)
+ #  2.0.12-stable--    2.0        6:1:1 (No ABI change)
+ #
+ # For Libevent 2.1:
  #  2.1.1-alpha --     2.1        1:0:0
  
  

diff --cc event.c
Simple merge

diff --cc test/regress_ssl.c
index c2f7a14da5a45973ab6390f6365a4cb4b2c4d3a6,6bc5f320852c0012938a5c170871f70a7f10f976..6bac30e413297ecbc5ccb44c94e5efe7f682194f
--- 1/test/regress_ssl.c
--- 2/test/regress_ssl.c
+++ b/test/regress_ssl.c
@@@ -29,7 -29,8 +29,8 @@@
  #include <windows.h>
  #endif
  
 -#ifndef WIN32
 +#ifndef _WIN32
+ #include <sys/types.h>
  #include <sys/socket.h>
  #include <netinet/in.h>
  #endif