[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

[nickm at torproject.org]

commit a48ae2aa67b31cc97942ac2c7fd6f29beba59e3b
Merge: ddd66cc01 6862eada6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 1 11:19:29 2017 -0400

    Merge branch 'maint-0.2.6' into maint-0.2.7-redux

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