commit 01c73711f1b91643ff12c82e539c1ef783fdfe8c Merge: d66cfadbd bcce3e7e0 Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 31 08:30:58 2018 -0400

Merge branch 'maint-0.3.4'

changes/bug26876 | 4 ++++ configure.ac | 32 +++++++++++++++++++++++++++++--- 2 files changed, 33 insertions(+), 3 deletions(-)

diff --cc configure.ac index 3a2f579b6,4f5d8337e..32eed75bf --- a/configure.ac +++ b/configure.ac @@@ -581,51 -591,46 +581,50 @@@ AC_CHECK_FUNCS eventfd \ explicit_bzero \ timingsafe_memcmp \ - flock \ - ftime \ - get_current_dir_name \ - getaddrinfo \ - getifaddrs \ - getpass \ - getrlimit \ - gettimeofday \ - gmtime_r \ + flock \ + ftime \ + get_current_dir_name \ + getaddrinfo \ + getdelim \ + getifaddrs \ + getline \ + getpass \ + getrlimit \ + gettimeofday \ + gmtime_r \ gnu_get_libc_version \ htonll \ - inet_aton \ - ioctl \ - issetugid \ - llround \ - localtime_r \ - lround \ - memmem \ - memset_s \ - mmap \ + inet_aton \ + ioctl \ + issetugid \ + llround \ + localtime_r \ + lround \ - mach_approximate_time \ + memmem \ + memset_s \ + mmap \ pipe \ pipe2 \ - prctl \ + prctl \ readpassphrase \ - rint \ - sigaction \ - socketpair \ + rint \ + sigaction \ + socketpair \ statvfs \ - strlcat \ - strlcpy \ + strncasecmp \ + strcasecmp \ + strlcat \ + strlcpy \ strnlen \ - strptime \ - strtok_r \ - strtoull \ - sysconf \ + strptime \ + strtok_r \ + strtoull \ + sysconf \ sysctl \ truncate \ - uname \ + uname \ usleep \ - vasprintf \ + vasprintf \ _vscprintf )