Merge branch 'maint-0.3.4'

diff --cc configure.ac
index 3a2f579b6388a18a09340ad65956f689d6027f66,4f5d8337ee7b3c086d83700a3323c58e46d43ead..32eed75bf93833f92baa96b4671667a0561a4014
--- 1/configure.ac
--- 2/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
  )