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

[nickm at torproject.org]

commit 3cfcfbac46d15f7d1cc47da03482aa70583aa455
Merge: 74775b2df 54e249e26
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 3 09:27:42 2019 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.4

 changes/geoip-2019-04-02 |     4 +
 src/config/geoip         | 10355 +++++++++++++++++++++++++--------------------
 src/config/geoip6        |  2337 ++++++----
 3 files changed, 7344 insertions(+), 5352 deletions(-)