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

[nickm at torproject.org]

commit 086459091974830a99e97ec9a72fa3b8c8866a22
Merge: 4843d5349 19f386852
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 12 08:11:20 2018 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1

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