[tor-commits] [tor/master] Merge branch 'maint-0.3.4' into maint-0.3.5

[nickm at torproject.org]

commit 2e770216c498d7e714d1dbd78ab8790e137959f1
Merge: 46b6df712 db209d4db
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 12 09:56:49 2019 -0500

    Merge branch 'maint-0.3.4' into maint-0.3.5

 changes/geoip-2019-02-05 |     4 +
 src/config/geoip         | 22020 ++++++++++++++++++++++++++++++++-------------
 src/config/geoip6        |  2401 +++--
 3 files changed, 16972 insertions(+), 7453 deletions(-)