commit f10ec55b25ab103df3c67d6ae9d760188c32ee9d Merge: 6168d2e 10ad344 Author: Roger Dingledine arma@torproject.org Date: Tue Feb 22 22:54:33 2011 -0500

Merge branch 'maint-0.2.1' into release-0.2.1

changes/bug1859 | 9 +++++++++ changes/bug2402 | 4 ++++ configure.in | 2 +- src/or/config.c | 11 +---------- src/or/connection_edge.c | 2 +- src/or/rendclient.c | 5 ++++- src/or/routerlist.c | 3 --- 7 files changed, 20 insertions(+), 16 deletions(-)

diff --combined configure.in index 5514b71,7cdb330..c91bce0 --- a/configure.in +++ b/configure.in @@@ -5,7 -5,7 +5,7 @@@ dnl Copyright (c) 2007-2008, The Tor Pr dnl See LICENSE for licensing information

AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.1.25) +AM_INIT_AUTOMAKE(tor, 0.2.1.29) AM_CONFIG_HEADER(orconfig.h)

AC_CANONICAL_HOST @@@ -866,7 -866,7 +866,7 @@@ f

CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib"

- AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile contrib/osx/Makefile contrib/osx/TorBundleDesc.plist contrib/osx/TorBundleInfo.plist contrib/osx/TorDesc.plist contrib/osx/TorInfo.plist contrib/osx/TorStartupDesc.plist src/config/torrc.sample doc/tor.1 src/Makefile doc/Makefile doc/design-paper/Makefile doc/spec/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh]) + AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile contrib/osx/Makefile contrib/osx/TorBundleDesc.plist contrib/osx/TorBundleInfo.plist contrib/osx/TorDesc.plist contrib/osx/TorInfo.plist contrib/osx/TorStartupDesc.plist src/config/torrc.sample doc/tor.1 src/Makefile doc/Makefile doc/design-paper/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh]) AC_OUTPUT

if test -x /usr/bin/perl && test -x ./contrib/updateVersions.pl ; then