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

[nickm at torproject.org]

commit 82ce0be921611e717a91f4293b56a4fa59e7c86a
Merge: f2df0fc 71dd1d7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 8 08:08:20 2017 -0400

    Merge branch 'maint-0.2.7-redux' into release-0.2.7-redux

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