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

[arma at torproject.org]

commit bc58bfda70dca39a2a2d74c55600e0fe9d975ad9
Merge: 260b3b1 f6f691d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Feb 15 00:06:40 2014 -0500

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

 changes/geoip6-february2014 |    3 +
 src/config/geoip6           | 7834 +++++++++++++++++++++++++++++++++++++------
 2 files changed, 6783 insertions(+), 1054 deletions(-)