commit aeb117f62c1831a434e167cdf6b0cc4e970728ce Merge: 174cbff 8e38303 Author: Roger Dingledine arma@torproject.org Date: Thu Jul 7 13:31:08 2011 -0400

Merge branch 'maint-0.2.2'

changes/geoip-july2011 | 3 + src/config/geoip | 6345 ++++++++++++++++++++++++++++++------------------ 2 files changed, 3963 insertions(+), 2385 deletions(-)