commit 7758c66b3116c23c6a6d24bb905ca4ddaef152bc Merge: d602198 91c6b18 Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 6 08:32:56 2017 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

changes/geoip-april2017 | 4 + src/config/geoip | 14366 +++++++++++++++++++++++++++++----------------- src/config/geoip6 | 677 ++- 3 files changed, 9792 insertions(+), 5255 deletions(-)