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

[nickm at torproject.org]

commit 25c28bc2d920ffa0fe36c2de7833735255582c3a
Merge: b5526be ecc73c3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 8 10:11:05 2017 -0500

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

 changes/geoip-march2017 |     4 +
 src/config/geoip        | 13115 +++++++++++++++++++---------------------------
 src/config/geoip6       |   754 ++-
 3 files changed, 5884 insertions(+), 7989 deletions(-)