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

[nickm at torproject.org]

commit 5ff0b519ecee6e3d0b6d4550bd74f197a818b08d
Merge: 4a9f689 dc34cd7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 8 08:07:32 2017 -0400

    Merge branch 'maint-0.2.8' into maint-0.2.9

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