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

[nickm at torproject.org]

commit 91c6b18ca055fa709ade362a315aa64820081a0d
Merge: 2cfecec 44bc882
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 6 08:31:32 2017 -0400

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

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