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

[nickm at torproject.org]

commit bdf60fc7ce40d5f78ac1f995447d104be48cbcea
Merge: 82f109c2b ad7db1077
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Oct 5 11:03:36 2017 -0400

    Merge branch 'maint-0.3.0' into maint-0.3.1

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