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

[nickm at torproject.org]

commit afa2c39baa61777b7f5bdfed28efe2ac5087dc4b
Merge: 4ca18fde9 b0fa1f4fb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 11 10:17:18 2019 -0400

    Merge branch 'maint-0.3.5' into maint-0.4.0

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