[tor-commits] [tor/maint-0.2.6] Merge remote-tracking branch 'karsten/geoip6-mar2015' into maint-0.2.4

[nickm at torproject.org]

commit 220e9be0959241ce5ea36f64bc08245292a6b06c
Merge: 5588e67 6271406
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 9 16:24:07 2015 -0400

    Merge remote-tracking branch 'karsten/geoip6-mar2015' into maint-0.2.4

 changes/geoip6-march2015 |    3 +
 src/config/geoip6        | 1228 ++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 1013 insertions(+), 218 deletions(-)