[tor-commits] [tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2

commit 4cdf6ac336351de937f2367f2c23546ad171cd29 Merge: 0640d09 8e38303 Author: Roger Dingledine <arma@torproject.org> Date: Thu Jul 7 13:29:19 2011 -0400 Merge branch 'maint-0.2.2' into release-0.2.2 changes/geoip-july2011 | 3 + src/config/geoip | 6345 ++++++++++++++++++++++++++++++------------------ 2 files changed, 3963 insertions(+), 2385 deletions(-)