commit 6d6e87f6116f98e2e8e310bed08776718739d3ac Merge: bcd99a2 d679ef6 Author: Roger Dingledine arma@torproject.org Date: Mon Sep 12 05:55:17 2011 -0400

Merge branch 'maint-0.2.2' into release-0.2.2

changes/bug2442 | 8 + changes/bug2442b | 8 + changes/geoip-september2011 | 3 + changes/typo-fix-ohkah8Ah | 9 + src/config/geoip | 5974 ++++++++++++++++++++++++++++++------------- src/or/or.h | 7 +- src/or/rendservice.c | 15 +- 7 files changed, 4179 insertions(+), 1845 deletions(-)