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

[nickm at torproject.org]

commit 00dc2f7ee8be42fa35e2a6eabf32e98436771935
Merge: e1c878731 b4362b99c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 9 08:47:26 2018 -0400

    Merge branch 'maint-0.3.4' into release-0.3.4

 changes/geoip-2018-08-07 |     4 +
 src/config/geoip         | 14291 ++++++++++++++++++++++++++-------------------
 src/config/geoip6        |   974 ++-
 3 files changed, 9063 insertions(+), 6206 deletions(-)