commit cd7d006e0829ac83c1d9e5f04fff9ca239973014 Merge: 875b1fb 307be8d Author: Nick Mathewson nickm@torproject.org Date: Fri Jun 9 09:58:46 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

changes/geoip-june2017 | 4 + src/config/geoip | 5079 +++++++++++++++++++++++++----------------------- src/config/geoip6 | 1952 +++++++++++++++++-- 3 files changed, 4449 insertions(+), 2586 deletions(-)