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

[nickm at torproject.org]

commit 9b90d515a9fc52c2579d55406e78de8d2fb5fa19
Merge: eca4a89 75fe218
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 13 14:37:55 2017 -0500

    Merge branch 'maint-0.2.7' into maint-0.2.8

 changes/geoip-february2017 |     4 +
 src/config/geoip           | 10832 ++++++++++++++++++++++++-------------------
 src/config/geoip6          |  1651 ++++++-
 3 files changed, 7351 insertions(+), 5136 deletions(-)