[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0

[nickm at torproject.org]

commit f33c96610f143c71c0309c1021821ab05878f8a0
Merge: 8925e84be 969602159
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 3 08:44:31 2017 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.0

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