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

[nickm at torproject.org]

commit e5fe8b0e3aff7b2c40df92414c57626a36f4500c
Merge: f57d8722e b057623be
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 10 11:34:49 2018 -0400

    Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/geoip-2018-10-09 |     4 +
 src/config/geoip         | 38518 ++++++++++++++++++++++++++++++++++-----------
 src/config/geoip6        |  1317 +-
 3 files changed, 30779 insertions(+), 9060 deletions(-)