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

[nickm at torproject.org]

commit c1f86f74927d9233305b4ef93adebf52dadd0147
Merge: 967efc0d2 c4f7953d8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 6 09:26:33 2018 -0500

    Merge branch 'maint-0.3.4' into maint-0.3.5

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