[tor-commits] [tor/master] Merge remote-tracking branch 'karsten/geoip-may2012' into maint-0.2.2

[nickm at torproject.org]

commit 0be946c6936265616e92d8c1b3350ece2501c0dc
Merge: 436654e 24731ce
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 15 10:00:51 2012 -0400

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

 changes/geoip-may2012 |    3 +
 src/config/geoip      |  748 ++++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 647 insertions(+), 104 deletions(-)