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

[nickm at torproject.org]

commit 7cbdec578b291da11dcd419988ee985b7589ec48
Merge: ba17cdf df4c484
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jan 23 08:52:55 2015 -0500

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

 changes/geoip-january2015  |    3 +
 changes/geoip6-january2015 |    2 +
 src/config/geoip           |12872 +++++++++++++++++---------------------------
 src/config/geoip6          | 1263 ++++-
 4 files changed, 6073 insertions(+), 8067 deletions(-)