commit 10d9bcb2a2fe4e49afd88251fe92181c2ffbc231 Merge: a72b181 f570470 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Aug 8 17:21:39 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/geoip-august2011 | 3 + src/config/geoip | 6191 ++++++++++++++++++++++++---------------------- 2 files changed, 3235 insertions(+), 2959 deletions(-)