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

[nickm at torproject.org]

commit a521c427883697fcfa027ffd72bb38f3aee5aceb
Merge: cbce8dedd 4e262196a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri May 17 08:10:15 2019 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.4

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