commit df4c484021a2c4086084b82f9eade29231c038f9 Merge: dbd5a9a a9ce0cd Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jan 23 08:52:35 2015 -0500 Merge remote-tracking branch 'karsten/geoip6-jan2015' into maint-0.2.4 changes/geoip6-january2015 | 2 + src/config/geoip6 | 1263 +++++++++++++++++++++++++++++++++++--------- 2 files changed, 1004 insertions(+), 261 deletions(-)