commit 509d7e02e98974d1aa5633d16cd0488ad5e447dd Merge: 3b39ec4 6ef44b7 Author: Roger Dingledine arma@torproject.org Date: Sun Nov 20 15:08:07 2011 -0500
Merge branch 'maint-0.2.2' into release-0.2.2
changes/bug4349 | 4 + changes/bug4353 | 7 + changes/bug4383 | 5 + changes/bug4410 | 5 + changes/bug4424 | 6 + changes/bug4426 | 8 + changes/bug4437 | 5 + changes/bug4457 | 9 + changes/geoip-november2011 | 3 + changes/win-bundle-path | 4 + contrib/package_nsis-mingw.sh | 2 +- src/common/compat.h | 6 +- src/common/compat_libevent.c | 19 +- src/config/geoip | 5098 ++++++++++++++++++++++++++--------------- src/or/circuitbuild.c | 3 +- src/or/config.c | 9 + src/or/connection_or.c | 2 +- src/or/rendclient.c | 9 +- src/or/rendservice.c | 9 +- src/or/routerparse.c | 5 + 20 files changed, 3409 insertions(+), 1809 deletions(-)