[tor-commits] [tor/release-0.2.1] Merge remote-tracking branch 'karsten/geoip-november2011' into maint-0.2.1

[nickm at torproject.org]

commit 13f02c387f894a8b11088926c44c6d8ad89adbf7
Merge: be6928d 6d45c6d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 14 11:10:10 2011 -0500

    Merge remote-tracking branch 'karsten/geoip-november2011' into maint-0.2.1

 changes/geoip-november2011 |    3 +
 src/config/geoip           | 5098 ++++++++++++++++++++++++++++----------------
 2 files changed, 3302 insertions(+), 1799 deletions(-)