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

[nickm at torproject.org]

commit 76ed869ff9b1e0b33b31ec22c6fd2957edb1ae45
Merge: 2ac2d0a42 6b2ff4fff
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Nov 11 11:57:53 2018 -0500

    Merge branch 'maint-0.3.4' into maint-0.3.5

 changes/geoip-2018-11-06 |     4 +
 src/config/geoip         | 22164 +++++++++++++++++++++++----------------------
 src/config/geoip6        |  2572 ++++--
 3 files changed, 13068 insertions(+), 11672 deletions(-)