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

[nickm at torproject.org]

commit 40faebd45bff486911b1fe2ba6f5e221c65d9fe9
Merge: 1723138fc 5e9264671
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Dec 20 12:15:24 2017 -0500

    Merge branch 'maint-0.3.1' into release-0.3.1

 changes/geoip-2017-12-06 |     4 +
 src/config/geoip         | 12380 +++++++++++++++++++++++++++------------------
 src/config/geoip6        |  3373 +++++++++---
 3 files changed, 10033 insertions(+), 5724 deletions(-)