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

[nickm at torproject.org]

commit fde551a387bf743dd974512f63405c6e63de49b4
Merge: c4d0d9bd2 8982719f6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 9 08:47:25 2018 -0400

    Merge branch 'maint-0.3.2' into maint-0.3.3

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