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

[nickm at torproject.org]

commit f8707e4f6c50a1dcd9023923a3a1b117bc3bc8b8
Merge: 039a77636 512dfa15e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Nov 11 12:23:34 2017 -0500

    Merge branch '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(-)