From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 31 Jul 2018 12:30:58 +0000 (-0400)
Subject: Merge branch 'maint-0.3.4'
X-Git-Tag: tor-0.3.5.1-alpha~173
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=01c73711f1b91643ff12c82e539c1ef783fdfe8c;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.4'
---

01c73711f1b91643ff12c82e539c1ef783fdfe8c
diff --cc configure.ac
index 3a2f579b63,4f5d8337ee..32eed75bf9
--- 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
  )