[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 f2df0fc887088bab9d85144357524259b64e8cd7
Merge: ae0586f 44bc882
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 6 08:32:48 2017 -0400

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

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