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

[nickm at torproject.org]

commit b2470f5140954db29e81498ad34d0c8cd7705064
Merge: fa195626b 6dca180ae
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 12 08:11:20 2018 -0400

    Merge branch '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(-)