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

[nickm at torproject.org]

commit 7c9be64e1af05aa1fdac894ffe9ef98f80091d57
Merge: c066f2d 306f2f0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 9 16:25:11 2015 -0400

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

 changes/geoip-march2015  |    3 +
 changes/geoip6-march2015 |    3 +
 src/config/geoip         |12695 ++++++++++++++++++++++++++++++++++------------
 src/config/geoip6        | 1228 ++++-
 4 files changed, 10398 insertions(+), 3531 deletions(-)