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

[nickm at torproject.org]

commit 0c9cd7c487ac75d9505f46e5ff42087d383eb1b4
Merge: 76b55fde8 2e74edb53
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 6 14:29:29 2019 -0500

    Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/geoip-2019-03-04 |     4 +
 src/config/geoip         | 12163 ++++++++++++++++++++++++---------------------
 src/config/geoip6        |  2251 ++++++---
 3 files changed, 8221 insertions(+), 6197 deletions(-)