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

[nickm at torproject.org]

commit 0cd7c1af37155c9adf779a42a94970a4c119311e
Merge: 44e4a96bb bdf60fc7c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Oct 5 11:03:36 2017 -0400

    Merge branch 'maint-0.3.1'

 changes/geoip-october2017 |    4 +
 src/config/geoip          | 8683 +++++++++++++++++++++++++++------------------
 src/config/geoip6         |  653 ++--
 3 files changed, 5654 insertions(+), 3686 deletions(-)