commit ee2efc5c8262619775a2caeba6153d9c915b1ddb Merge: 8522652 3cb79a0 Author: Roger Dingledine arma@torproject.org Date: Mon Oct 24 02:36:01 2011 -0400

Merge branch 'maint-0.2.2' into release-0.2.2

changes/bug4059 | 5 + changes/bug4115 | 7 + changes/bug4124 | 6 + changes/bug4201 | 5 + changes/bug4212 | 13 + changes/bug4251 | 8 + changes/bug4259 | 4 + changes/dirreq-stats-default | 5 + changes/geoip-october2011 | 3 + changes/ticket-4063 | 6 + changes/windows_8 | 5 + src/common/OpenBSD_malloc_Linux.c | 2 +- src/common/compat.c | 3 +- src/config/geoip | 5460 ++++++++++++++++++++++--------------- src/or/circuitbuild.c | 11 +- src/or/config.c | 63 +- src/or/connection_edge.c | 9 +- src/or/directory.c | 3 +- src/or/main.c | 2 +- src/or/rendclient.c | 18 +- src/or/rendservice.c | 13 + 21 files changed, 3439 insertions(+), 2212 deletions(-)