commit b45f0f8fb9b11effcd48159c078f09a3fbc04b11 Merge: 244ca67 6235b47 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Aug 13 12:51:38 2014 -0400 Merge remote-tracking branch 'karsten/geoip6-aug2014' into maint-0.2.4 changes/geoip6-august2014 | 3 + src/config/geoip6 | 2012 +++++++++++++++------------------------------ 2 files changed, 687 insertions(+), 1328 deletions(-)