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

[nickm at torproject.org]

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

    Merge branch 'maint-0.3.1' into release-0.3.1

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