From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 9 Sep 2011 16:58:12 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.4-alpha~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a41f1fc6127a688485b90c1fc2bfcbeb59e41f0b;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'origin/maint-0.2.2'

Conflicts:
	configure.in
	src/or/circuitbuild.c
---

a41f1fc6127a688485b90c1fc2bfcbeb59e41f0b
diff --cc configure.in
index 824547c6d7,047545d36b..a449136f93
--- a/configure.in
+++ b/configure.in
@@@ -286,28 -229,7 +286,30 @@@ dnl -----------------------------------
  dnl Check for functions before libevent, since libevent-1.2 apparently
  dnl exports strlcpy without defining it in a header.
  
 -AC_CHECK_FUNCS(gettimeofday ftime socketpair uname inet_aton strptime getrlimit strlcat strlcpy strtoull getaddrinfo localtime_r gmtime_r memmem strtok_r writev readv flock prctl vasprintf lround rint)
 +AC_CHECK_FUNCS(
 +	accept4 \
 +        flock \
 +        ftime \
 +        getaddrinfo \
 +        getrlimit \
 +        gettimeofday \
 +        gmtime_r \
 +        inet_aton \
 +        localtime_r \
++	lround \
 +        memmem \
 +        prctl \
++	rint \
 +        socketpair \
 +        strlcat \
 +        strlcpy \
 +        strptime \
 +        strtok_r \
 +        strtoull \
 +        sysconf \
 +        uname \
 +        vasprintf \
 +)
  
  using_custom_malloc=no
  if test x$enable_openbsd_malloc = xyes ; then