commit f7503fb1a5c9a1f4e765d8c7d31613b4e7c138c2 Merge: 153a0b2 307be8d Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jun 9 09:58:45 2017 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 changes/geoip-june2017 | 4 + src/config/geoip | 5079 +++++++++++++++++++++++++----------------------- src/config/geoip6 | 1952 +++++++++++++++++-- 3 files changed, 4449 insertions(+), 2586 deletions(-)