commit 137982f955b297b41a89086d672baf761825c152 Merge: 8d5f1e6 5441c73 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Nov 24 09:18:36 2014 -0500 Merge remote-tracking branch 'karsten/geoip6-nov2014' into maint-0.2.4 changes/geoip6-november2014 | 3 + src/config/geoip6 | 5649 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 5509 insertions(+), 143 deletions(-)