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

[nickm at torproject.org]

commit c7f9f7e5426b473a505063904116760c7fae7e11
Merge: 7e3f7ab40 e5deb2bbc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri May 17 08:10:16 2019 -0400

    Merge branch 'maint-0.3.5' into maint-0.4.0

 changes/geoip-2019-05-13 |     4 +
 src/config/geoip         | 15407 ++++++++++++++++++++++++++-------------------
 src/config/geoip6        |  3771 +++++++----
 3 files changed, 11335 insertions(+), 7847 deletions(-)