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

[nickm at torproject.org]

commit 71dd1d716ac83d98ab4592f46b984338a1a7685b
Merge: 44bc882 159ddf6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 8 08:07:11 2017 -0400

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

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