[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8

[nickm at torproject.org]

commit 1e4a5dc9d18a3bed67f93c72bbadc8b479a61525
Merge: 7758c66 dc34cd7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 8 08:08:26 2017 -0400

    Merge branch 'maint-0.2.8' into release-0.2.8

 changes/geoip-may2017 |    4 +
 src/config/geoip      | 5862 +++++++++++++++++++++++++++++++------------------
 src/config/geoip6     |  689 +++++-
 3 files changed, 4358 insertions(+), 2197 deletions(-)