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

[nickm at torproject.org]

commit b0fa1f4fb0b4f6a474b20e40e2810936c0577cc2
Merge: dcb8cad4e 0ec4ebd00
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 11 10:17:17 2019 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.5

 changes/geoip-2019-06-10 |     4 +
 src/config/geoip         | 14985 +++++++++++++++++++++++++--------------------
 src/config/geoip6        |  2391 ++++++--
 3 files changed, 9920 insertions(+), 7460 deletions(-)