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

[nickm at torproject.org]

commit 6dca180ae9abcd5bd12c6aa4dda8d3e19017a6cb
Merge: a14112743 74ac463e7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 12 08:11:20 2018 -0400

    Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/geoip-2018-06-07 |    4 +
 src/config/geoip         | 5848 +++++++++++++++++++++++++++++-----------------
 src/config/geoip6        |  810 ++++++-
 3 files changed, 4354 insertions(+), 2308 deletions(-)