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

[nickm at torproject.org]

commit 09f5077d48cc76d6a4805536c781c4d04b69768f
Merge: 72aa33c01 4a19498ed
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 1 11:19:30 2017 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1

 changes/geoip-july2017 |     4 +
 src/config/geoip       | 10075 ++++++++++++++++++++++++++++++++---------------
 src/config/geoip6      |   694 +++-
 3 files changed, 7530 insertions(+), 3243 deletions(-)