commit 6494f3346b0e7b8b641c720c2d5c1e8277935f6f Merge: e9124b8 11edbf4 Author: Nick Mathewson nickm@torproject.org Date: Wed Sep 7 13:54:12 2016 -0400

Merge branch 'maint-0.2.7' into maint-0.2.8

changes/geoip-september2016 | 4 + src/config/geoip | 30846 +++++++++++++----------------------------- src/config/geoip6 | 2373 ++-- 3 files changed, 10566 insertions(+), 22657 deletions(-)