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

[nickm at torproject.org]

commit 3bc28c4c04584d599c933491f3b2d11f2cef1aaf
Merge: ab774a8 40579cb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 10 21:08:12 2014 -0400

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

 changes/geoip6-june2014 |    2 +
 src/config/geoip6       | 2115 ++++++++++++++++++++++++++++++++---------------
 2 files changed, 1437 insertions(+), 680 deletions(-)