commit 1d40f8ad8269c8d86f3eddcf77e0a952f8a2379e Merge: 9a34da9 8c91cbb Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 11 09:13:00 2017 -0500

Merge branch 'maint-0.2.7' into release-0.2.7

changes/geoip-january2017 | 4 + src/config/geoip | 3160 +++++++++++++++++++++++++++++---------------- src/config/geoip6 | 561 +++++++- 3 files changed, 2552 insertions(+), 1173 deletions(-)