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

[nickm at torproject.org]

commit 19f386852333a6de5fbf9bcb3a4415b3bb135b4d
Merge: 1ef8023e0 ae540569c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 12 08:11:19 2018 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.1

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