commit 6ef2e30c72b93ccd55ab0937635bca059e25d33d Merge: f1c43a1 ee545cd Author: Roger Dingledine <arma@torproject.org> Date: Mon Oct 24 02:25:33 2011 -0400 Merge branch 'maint-0.2.1' into release-0.2.1 changes/abandon-rend-circs-on-newnym | 8 + changes/bug2574 | 3 + changes/bug4014 | 3 + changes/cid_428 | 5 + changes/cid_450 | 5 + changes/geoip-august2011 | 3 + changes/geoip-july2011 | 3 + changes/geoip-june2011 | 3 + changes/geoip-october2011 | 3 + changes/geoip-september2011 | 3 + src/common/compat.c | 16 +- src/config/geoip |24782 ++++++++++++++++++++++------------ src/or/circuituse.c | 3 +- src/or/connection.c | 8 +- src/or/eventdns.c | 2 +- src/or/main.c | 8 +- src/or/or.h | 4 +- src/or/rendcommon.c | 1 + src/or/router.c | 6 +- 19 files changed, 16199 insertions(+), 8670 deletions(-)