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

diff --cc sample/Makefile.am
index 6e88627c19516d9e2510e85c87c0bb79e5472b9a,6a148148b63772382c2e1b8c99f1cdd5df10a4ce..61e72d60eb6cf243e8e2d4e7484ac1cadaa55151
--- 1/sample/Makefile.am
--- 2/sample/Makefile.am
+++ b/sample/Makefile.am
@@@ -5,17 -5,16 +5,17 @@@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_s
  
  noinst_PROGRAMS = event-test time-test signal-test dns-example hello-world http-server
  
- event_test_sources = event-test.c
- time_test_sources = time-test.c
- signal_test_sources = signal-test.c
- dns_example_sources = dns-example.c
- hello_world_sources = hello-world.c
- http_server_sources = http-server.c
+ event_test_SOURCES = event-test.c
+ time_test_SOURCES = time-test.c
+ signal_test_SOURCES = signal-test.c
+ dns_example_SOURCES = dns-example.c
+ hello_world_SOURCES = hello-world.c
+ http_server_SOURCES = http-server.c
  
  if OPENSSL
 +AM_CPPFLAGS += $(OPENSSL_INCS)
  noinst_PROGRAMS += le-proxy
- le_proxy_sources = le-proxy.c
+ le_proxy_SOURCES = le-proxy.c
  le_proxy_LDADD = $(LDADD) ../libevent_openssl.la -lssl -lcrypto
  endif