commit fa22cc651461b05f4c421e82f85d59f55e7c631d Merge: 14f3f8e34 93b28972c Author: Nick Mathewson nickm@torproject.org Date: Thu Aug 3 08:44:31 2017 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

changes/geoip-august2017 | 4 + src/config/geoip | 10796 ++++++++++++++++++++++++++++----------------- src/config/geoip6 | 607 ++- 3 files changed, 7161 insertions(+), 4246 deletions(-)