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

[nickm at torproject.org]

commit 512dfa15edf9723cb5bfa2b86d5658e320496445
Merge: aa1d90b40 ef9251157
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Nov 11 12:23:34 2017 -0500

    Merge branch 'maint-0.3.1' into maint-0.3.2

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