commit 0b078d9eda0b0204420e09bb15807b062161e350 Merge: 6459205 ba0cd80 Author: Roger Dingledine arma@torproject.org Date: Fri Apr 8 16:43:47 2011 -0400

Merge branch 'maint-0.2.2' into release-0.2.2

changes/bug539_removal | 6 ++ changes/connect_err_reporting | 6 ++ changes/count_overflow | 5 + changes/feature2711 | 4 + changes/full_ap_circuits | 6 ++ changes/kill_ftime | 7 ++ changes/noroute | 5 + src/common/address.c | 20 +++-- src/common/compat_libevent.c | 17 ++--- src/common/memarea.c | 7 +- src/common/util.c | 77 ------------------ src/common/util.h | 10 --- src/or/buffers.c | 6 +- src/or/circuitbuild.c | 9 +- src/or/circuitlist.c | 3 + src/or/circuituse.c | 7 +- src/or/config.c | 6 +- src/or/connection.c | 36 +++++--- src/or/connection_edge.c | 30 +++++-- src/or/connection_or.c | 6 +- src/or/control.c | 4 +- src/or/directory.c | 37 ++++----- src/or/dirserv.c | 11 ++- src/or/dns.c | 2 +- src/or/dnsserv.c | 2 +- src/or/eventdns.c | 2 +- src/or/geoip.c | 177 ++++++++++++++++++++++------------------ src/or/geoip.h | 2 +- src/or/networkstatus.c | 11 ++- src/or/or.h | 12 ++- src/or/reasons.c | 8 +-- src/or/relay.c | 2 + src/or/rendclient.c | 4 +- src/or/rendcommon.c | 2 +- src/or/rephist.c | 2 +- src/or/routerlist.c | 18 ++-- src/or/routerparse.c | 2 +- 37 files changed, 286 insertions(+), 285 deletions(-)