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

[nickm at torproject.org]

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

    Merge branch 'maint-0.3.4'

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