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

[nickm at torproject.org]

commit 4b067f8b128f0c2c4b808d72793a394f628aac18
Merge: 4a03851e4 38b7885c9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 13 10:58:03 2018 -0400

    Merge branch 'maint-0.3.2' into release-0.3.2

 changes/geoip-2018-03-08 |     4 +
 src/config/geoip         | 36382 ++++++++++++---------------------------------
 src/config/geoip6        |   662 +-
 3 files changed, 9970 insertions(+), 27078 deletions(-)