[or-cvs] [tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2
arma at torproject.org
arma at torproject.org
Sat Jan 15 22:31:53 UTC 2011
commit d4f10b83431cecab0c9479c9fa9fa45d71804e71
Merge: 9bbe4de a7790d4
Author: Roger Dingledine <arma at torproject.org>
Date: Sat Jan 15 17:31:19 2011 -0500
Merge branch 'maint-0.2.2' into release-0.2.2
LICENSE | 2 +-
Makefile.am | 4 +-
changes/bug2060 | 4 +
changes/bug2190 | 11 +
changes/bug2305 | 5 +
changes/bug2313 | 4 +
changes/bug2314 | 4 +
changes/bug2324 | 4 +
changes/bug2324_uncompress | 5 +
changes/bug2326 | 6 +
changes/bug2328 | 9 +
changes/bug2330 | 7 +
changes/bug2331 | 7 +
changes/bug2332 | 4 +
changes/bug2337 | 3 +
changes/bug2346 | 6 +
changes/bug2352 | 6 +
changes/bug2363 | 6 +
changes/bug2364 | 4 +
changes/bug2384 | 6 +
changes/geoip-jan2011 | 3 +
changes/tolen_asserts | 8 +
configure.in | 17 +
contrib/bundle.nsi | 2 +-
contrib/netinst.nsi | 2 +-
contrib/polipo/README | 4 +-
doc/tor-resolve.1.txt | 6 +-
src/common/address.c | 2 +-
src/common/address.h | 2 +-
src/common/aes.c | 2 +-
src/common/aes.h | 2 +-
src/common/compat.c | 2 +-
src/common/compat.h | 4 +-
src/common/compat_libevent.c | 12 +-
src/common/container.c | 2 +-
src/common/container.h | 2 +-
src/common/crypto.c | 94 +-
src/common/crypto.h | 16 +-
src/common/ht.h | 2 +-
src/common/log.c | 76 +-
src/common/memarea.c | 2 +-
src/common/memarea.h | 2 +-
src/common/mempool.c | 2 +-
src/common/mempool.h | 2 +-
src/common/sha256.c | 2 +-
src/common/torgzip.c | 62 +-
src/common/torgzip.h | 2 +-
src/common/torint.h | 4 +-
src/common/torlog.h | 7 +-
src/common/tortls.c | 2 +-
src/common/tortls.h | 2 +-
src/common/tortls_states.h | 2 +-
src/common/util.c | 6 +-
src/common/util.h | 2 +-
src/config/geoip | 5317 ++++++++++++++++++++++++++++--------------
src/or/buffers.c | 10 +-
src/or/buffers.h | 2 +-
src/or/circuitbuild.c | 7 +-
src/or/circuitbuild.h | 2 +-
src/or/circuitlist.c | 2 +-
src/or/circuitlist.h | 2 +-
src/or/circuituse.c | 2 +-
src/or/circuituse.h | 2 +-
src/or/command.c | 5 +-
src/or/command.h | 2 +-
src/or/config.c | 19 +-
src/or/config.h | 2 +-
src/or/connection.c | 2 +-
src/or/connection.h | 2 +-
src/or/connection_edge.c | 55 +-
src/or/connection_edge.h | 2 +-
src/or/connection_or.c | 2 +-
src/or/connection_or.h | 2 +-
src/or/control.c | 2 +-
src/or/control.h | 2 +-
src/or/cpuworker.c | 4 +-
src/or/cpuworker.h | 2 +-
src/or/directory.c | 2 +-
src/or/directory.h | 2 +-
src/or/dirserv.c | 2 +-
src/or/dirserv.h | 2 +-
src/or/dirvote.c | 2 +-
src/or/dirvote.h | 2 +-
src/or/dns.c | 19 +-
src/or/dns.h | 2 +-
src/or/dnsserv.c | 5 +-
src/or/dnsserv.h | 2 +-
src/or/eventdns.c | 8 +-
src/or/eventdns_tor.h | 2 +-
src/or/geoip.c | 2 +-
src/or/geoip.h | 2 +-
src/or/hibernate.c | 2 +-
src/or/hibernate.h | 2 +-
src/or/main.c | 5 +-
src/or/main.h | 2 +-
src/or/microdesc.c | 2 +-
src/or/microdesc.h | 2 +-
src/or/networkstatus.c | 3 +-
src/or/networkstatus.h | 2 +-
src/or/ntmain.c | 8 +-
src/or/ntmain.h | 2 +-
src/or/onion.c | 8 +-
src/or/onion.h | 2 +-
src/or/or.h | 2 +-
src/or/policies.c | 2 +-
src/or/policies.h | 2 +-
src/or/reasons.c | 2 +-
src/or/reasons.h | 2 +-
src/or/relay.c | 2 +-
src/or/relay.h | 2 +-
src/or/rendclient.c | 5 +-
src/or/rendclient.h | 2 +-
src/or/rendcommon.c | 2 +-
src/or/rendcommon.h | 2 +-
src/or/rendmid.c | 8 +-
src/or/rendmid.h | 2 +-
src/or/rendservice.c | 10 +-
src/or/rendservice.h | 2 +-
src/or/rephist.c | 5 +-
src/or/rephist.h | 2 +-
src/or/router.c | 2 +-
src/or/router.h | 2 +-
src/or/routerlist.c | 5 +-
src/or/routerlist.h | 2 +-
src/or/routerparse.c | 36 +-
src/or/routerparse.h | 2 +-
src/or/tor_main.c | 2 +-
src/test/test.c | 2 +-
src/test/test.h | 2 +-
src/test/test_addr.c | 2 +-
src/test/test_containers.c | 2 +-
src/test/test_crypto.c | 34 +-
src/test/test_data.c | 2 +-
src/test/test_dir.c | 8 +-
src/test/test_util.c | 3 +-
src/tools/tor-gencert.c | 2 +-
src/tools/tor-resolve.c | 2 +-
137 files changed, 4143 insertions(+), 2030 deletions(-)
diff --combined configure.in
index 8f689bc,7c6a8a4..60eead6
--- a/configure.in
+++ b/configure.in
@@@ -4,7 -4,7 +4,7 @@@ dnl Copyright (c) 2007-2008, The Tor Pr
dnl See LICENSE for licensing information
AC_INIT
-AM_INIT_AUTOMAKE(tor, 0.2.2.19-alpha)
+AM_INIT_AUTOMAKE(tor, 0.2.2.20-alpha)
AM_CONFIG_HEADER(orconfig.h)
AC_CANONICAL_HOST
@@@ -588,6 -588,23 +588,23 @@@ if test "$tor_cv_time_t_signed" != no;
[Define to 1 iff time_t is signed])
fi
+ AC_CACHE_CHECK([whether size_t is signed], tor_cv_size_t_signed, [
+ AC_RUN_IFELSE([AC_LANG_SOURCE([
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+ #endif
+ int main(int c, char**v) { if (((size_t)-1)<0) return 1; else return 0; }])],
+ tor_cv_size_t_signed=no, tor_cv_size_t_signed=yes, tor_cv_size_t_signed=cross)
+ ])
+
+ if test "$tor_cv_size_t_signed" = cross; then
+ AC_MSG_NOTICE([Cross compiling: assuming that size_t is not signed.])
+ fi
+
+ if test "$tor_cv_size_t_signed" = yes; then
+ AC_MSG_ERROR([You have a signed size_t; that's grossly nonconformant.])
+ fi
+
AC_CHECK_SIZEOF(socklen_t, , [AC_INCLUDES_DEFAULT()
#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
More information about the tor-commits
mailing list