[tor-commits] [tor/release-0.2.4] Merge remote-tracking branch 'karsten/geoip-feb2014' into maint-0.2.3

[arma at torproject.org]

commit 405d0554652c977ac5c758c1871b5fdf2924ff05
Merge: 9e90707 26dd328
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Feb 15 00:06:01 2014 -0500

    Merge remote-tracking branch 'karsten/geoip-feb2014' into maint-0.2.3

 changes/geoip-february2014 |    3 +
 src/config/geoip           |17809 ++++++++++++++++++++++++--------------------
 2 files changed, 9649 insertions(+), 8163 deletions(-)