[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'

[nickm at torproject.org]

commit a41f1fc6127a688485b90c1fc2bfcbeb59e41f0b
Merge: d3ff167 b0695c1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 9 12:58:12 2011 -0400

    Merge remote-tracking branch 'origin/maint-0.2.2'
    
    Conflicts:
    	configure.in
    	src/or/circuitbuild.c

 changes/bug3894          |    4 ++
 changes/replay-firstpart |   13 +++++++
 configure.in             |    2 +
 src/common/torgzip.c     |    3 +-
 src/common/util.c        |    8 +++--
 src/or/circuitbuild.c    |   12 +++---
 src/or/control.c         |    4 +-
 src/or/relay.c           |    2 +-
 src/or/rendservice.c     |   26 +++++++++++++--
 src/or/rephist.c         |    4 +-
 src/or/routerlist.c      |   10 +++---
 src/or/routerparse.c     |   82 +++++++++++++++++++++++-----------------------
 src/test/test.c          |    4 +-
 13 files changed, 108 insertions(+), 66 deletions(-)

diff --cc configure.in
index 824547c,047545d..a449136
--- 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