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

[nickm at torproject.org]

commit ef9251157707aa77e1ba888a34bf65027188f2be
Merge: 5a21b2708 5348c8996
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Nov 11 12:23:34 2017 -0500

    Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/geoip-2017-11-06 |    4 +
 src/config/geoip         | 9406 ++++++++++++++++++++++++++++------------------
 src/config/geoip6        |  848 ++++-
 3 files changed, 6426 insertions(+), 3832 deletions(-)