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

[nickm at torproject.org]

commit 78bf56416868ed6de53af63d49c6d8555150f856
Merge: ac3e389db 9b10eb2d7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 5 08:22:34 2018 -0400

    Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/geoip-2018-04-03 |     4 +
 src/config/geoip         | 39253 ++++++++++++++++++++++++++++++++++-----------
 src/config/geoip6        |  5391 +++----
 3 files changed, 31480 insertions(+), 13168 deletions(-)