commit 9d5d3a7fd45265358069f0077857da1d7afaad61 Merge: e217569 c5d7ee7 Author: Nick Mathewson nickm@torproject.org Date: Thu Mar 8 10:50:03 2012 -0500

Merge remote-tracking branch 'karsten/geoip-march2012' into maint-0.2.2

changes/geoip-march2012 | 3 + src/config/geoip |26743 +++++++++++++++++++++++++++++++++++------------ 2 files changed, 19971 insertions(+), 6775 deletions(-)