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

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

diff --cc configure.in
index 824547c6d713e46e632854f73ada1310c01aef5f,047545d36b062546241c255c7c83870708c7d2ed..a449136f93035f69ed033527f08b271aed53ec2b
--- 1/configure.in
--- 2/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

diff --cc src/common/torgzip.c
Simple merge

diff --cc src/common/util.c
Simple merge

diff --cc src/or/circuitbuild.c
Simple merge

diff --cc src/or/control.c
Simple merge

diff --cc src/or/relay.c
Simple merge

diff --cc src/or/rendservice.c
Simple merge

diff --cc src/or/rephist.c
Simple merge

diff --cc src/or/routerlist.c
Simple merge

diff --cc src/or/routerparse.c
Simple merge

diff --cc src/test/test.c
Simple merge