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

[nickm at torproject.org]

commit 98aff146d367d08fd8f2d21131541bda951083ea
Merge: a394a2dd8 6acbd4c11
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 15 09:32:45 2018 -0400

    Merge branch 'maint-0.3.3'

 changes/geoip-2018-05-01 |    4 +
 src/config/geoip         | 5455 ++++++++++++++++++++++++++++++----------------
 src/config/geoip6        |  971 +++++++--
 3 files changed, 4468 insertions(+), 1962 deletions(-)