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

Conflicts:
	configure.in

diff --cc arc4random.c
Simple merge

diff --cc configure.in
index 14a0936f78712d9e9f0812f9dc1b7104a5b007d8,4e244448be9f6cc3984c95a701f3d9386cd9453d..8a9211d4ccd48a21f18008c1131a8dc86ff98401
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -304,37 -266,8 +304,38 @@@ AC_C_INLIN
  AC_HEADER_TIME
  
  dnl Checks for library functions.
 -AC_CHECK_FUNCS([gettimeofday vasprintf fcntl clock_gettime strtok_r strsep])
 -AC_CHECK_FUNCS([getnameinfo strlcpy inet_ntop inet_pton signal sigaction strtoll inet_aton pipe eventfd sendfile mmap splice arc4random arc4random_buf issetugid geteuid getegid getprotobynumber setenv unsetenv putenv sysctl])
 +AC_CHECK_FUNCS([ \
 +  arc4random \
 +  arc4random_buf \
 +  clock_gettime \
 +  eventfd \
 +  fcntl \
 +  getegid \
 +  geteuid \
 +  getifaddrs \
 +  getnameinfo \
 +  getprotobynumber \
 +  gettimeofday \
 +  inet_aton \
 +  inet_ntop \
 +  inet_pton \
 +  issetugid \
 +  mmap \
 +  pipe \
 +  putenv \
 +  sendfile \
 +  setenv \
 +  sigaction \
 +  signal \
 +  splice \
 +  strlcpy \
 +  strsep \
 +  strtok_r \
 +  strtoll \
++  sysctl \
 +  unsetenv \
 +  vasprintf \
 +])
  
  AC_CACHE_CHECK(
      [for getaddrinfo],