Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

Conflicts:
	src/common/test.h
	src/or/test.c

diff --cc Makefile.am
index d03c71ff2c605caf24fd81c523264f016752a5cb,4ded744fdec7fe57c67b492722ed50de473d9cce..eb61de7ff04b9e0946dc4d9aba923fa2f3e7c5b1
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -1,6 -1,7 +1,6 @@@
 -# $Id$
  # Copyright (c) 2001-2004, Roger Dingledine
  # Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
- # Copyright (c) 2007-2010, The Tor Project, Inc.
+ # Copyright (c) 2007-2011, The Tor Project, Inc.
  # See LICENSE for licensing information
  
  AUTOMAKE_OPTIONS = foreign

diff --cc contrib/polipo/README
Simple merge

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

diff --cc src/common/address.h
Simple merge

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

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

diff --cc src/common/compat.h
Simple merge

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

diff --cc src/common/container.h
Simple merge

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

diff --cc src/common/crypto.h
Simple merge

diff --cc src/common/ht.h
Simple merge

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

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

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

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

diff --cc src/common/torint.h
Simple merge

diff --cc src/common/torlog.h
Simple merge

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

diff --cc src/common/tortls.h
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc src/or/or.h
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc src/tools/tor-gencert.c
Simple merge

diff --cc src/tools/tor-resolve.c
Simple merge