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

[nickm at torproject.org]

commit 1af69c1812e561e99f8cb859bec21edcc8dbcd74
Merge: 9b9625bdf 451a84cec
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 9 09:11:41 2018 -0400

    Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/geoip-2018-07-03 |    4 +
 src/config/geoip         | 7171 ++++++++++++++++++++--------------------------
 src/config/geoip6        |  752 +++--
 3 files changed, 3732 insertions(+), 4195 deletions(-)