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

[nickm at torproject.org]

commit 155b0f5521b12c17d7e5b500c6aa7ed20fcacc12
Merge: f56645917 0c9cd7c48
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 6 14:29:33 2019 -0500

    Merge branch 'maint-0.3.3' into maint-0.3.4

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