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

[arma at torproject.org]

commit 260b3b1a190111a7ae078c4260c470bd31292b02
Merge: e4bc757 405d055
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Feb 15 00:06:25 2014 -0500

    Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

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