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

[nickm at torproject.org]

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

    Merge branch 'maint-0.2.9' into release-0.2.9

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