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

[nickm at torproject.org]

commit a9d4df9a0807704bf5cd1355c57ad0dc2a677a88
Merge: b548371f7 08592c95f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 7 15:18:01 2017 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/geoip-september2017 |     4 +
 src/config/geoip            | 10802 ++++++++++++++++++++++++------------------
 src/config/geoip6           |   941 +++-
 3 files changed, 6828 insertions(+), 4919 deletions(-)