commit b4ae31e2b7084b3a8cfcdb4e892f2c6d43aea0bc Merge: db96d1b 493d9cd Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jun 9 09:58:46 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 changes/geoip-june2017 | 4 + src/config/geoip | 5079 +++++++++++++++++++++++++----------------------- src/config/geoip6 | 1952 +++++++++++++++++-- 3 files changed, 4449 insertions(+), 2586 deletions(-)