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

[nickm at torproject.org]

commit 64e5600103b6def4834a127f645fb1b54934c59b
Merge: 18115b5aa 4a19498ed
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 1 11:19:30 2017 -0400

    Merge branch 'maint-0.3.1'

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