Merge remote-tracking branch 'public/bug3894'

diff --cc configure.in
index 0f31071a4dcacb906eb97eae66013c2e6fb015ca,df4c6f62b21d44268851a7e0a23f80b7c3bdc59f..56cf3d6d3316b7ac732c3365a4216a75ecf97395
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -645,41 -415,10 +645,43 @@@ AC_CHECK_HEADERS
  
  dnl These headers are not essential
  
 -AC_CHECK_HEADERS(stdint.h sys/types.h inttypes.h sys/param.h sys/wait.h limits.h sys/limits.h netinet/in.h arpa/inet.h machine/limits.h syslog.h sys/time.h sys/resource.h inttypes.h utime.h sys/utime.h sys/mman.h netinet/in6.h malloc.h sys/syslimits.h malloc/malloc.h linux/types.h sys/file.h malloc_np.h sys/prctl.h)
 +AC_CHECK_HEADERS(
 +        arpa/inet.h \
 +        crt_externs.h \
 +        grp.h \
 +        ifaddrs.h \
 +        inttypes.h \
 +        limits.h \
 +        linux/types.h \
 +        machine/limits.h \
 +        malloc.h \
 +        malloc/malloc.h \
 +        malloc_np.h \
 +        netdb.h \
 +        netinet/in.h \
 +        netinet/in6.h \
 +        pwd.h \
 +        stdint.h \
 +        sys/file.h \
 +        sys/ioctl.h \
 +        sys/limits.h \
 +        sys/mman.h \
 +        sys/param.h \
 +        sys/prctl.h \
 +        sys/resource.h \
 +        sys/socket.h \
 +        sys/syslimits.h \
 +        sys/time.h \
 +        sys/types.h \
 +        sys/un.h \
 +        sys/utime.h \
 +        sys/wait.h \
 +        syslog.h \
 +        utime.h
 +)
  
+ AC_CHECK_HEADERS(sys/param.h)
+ 
  TOR_CHECK_PROTOTYPE(malloc_good_size, HAVE_MALLOC_GOOD_SIZE_PROTOTYPE,
  [#ifdef HAVE_MALLOC_H
  #include <malloc.h>

diff --cc src/common/compat.h
Simple merge

diff --cc src/common/torint.h
Simple merge

diff --cc src/common/util.c
Simple merge