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

[nickm at torproject.org]

commit 02fcb29d11abe9556ab4d118f2f89e557d1751dd
Merge: c4c5077af e220e6e43
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 3 08:44:32 2017 -0400

    Merge branch 'maint-0.3.1'

 changes/geoip-august2017 |     4 +
 src/config/geoip         | 10796 ++++++++++++++++++++++++++++-----------------
 src/config/geoip6        |   607 ++-
 3 files changed, 7161 insertions(+), 4246 deletions(-)