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

[nickm at torproject.org]

commit c4f7953d8b869f9b7637428d5fc859fb62f302ff
Merge: e3a19b1c7 00341d97f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 6 09:26:32 2018 -0500

    Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/geoip-2018-12-05 |     4 +
 src/config/geoip         | 10100 +++++++++++++++++++++++++++------------------
 src/config/geoip6        |  3151 +++++++++-----
 3 files changed, 8147 insertions(+), 5108 deletions(-)