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

[nickm at torproject.org]

commit bded08415c439f65c1b36c12410b72986541b207
Merge: 8dfd916a4 ae540569c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 12 08:11:19 2018 -0400

    Merge branch 'maint-0.2.9' into release-0.2.9

 changes/geoip-2018-06-07 |    4 +
 src/config/geoip         | 5848 +++++++++++++++++++++++++++++-----------------
 src/config/geoip6        |  810 ++++++-
 3 files changed, 4354 insertions(+), 2308 deletions(-)