From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 5 Jun 2011 01:40:55 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/patches-2.0'
X-Git-Tag: release-2.1.1-alpha~257
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e40bafe796a8e544e9e54e247cb3aa30c95e06b0;p=libevent

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

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

e40bafe796a8e544e9e54e247cb3aa30c95e06b0
diff --cc Makefile.am
index 749d4427,bf3ae500..dae46c24
--- a/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 test/regress_ssl.c
index c2f7a14d,6bc5f320..6bac30e4
--- a/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