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

[nickm at torproject.org]

commit 09612b19c52ede4c8d2a89aaf18ab20e46014e66
Merge: 0456ec215 950606dcc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 13 10:58:03 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

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