[tor-commits] [tor/maint-0.2.8] Merge branch 'maint-0.2.5' into maint-0.2.6

[nickm at torproject.org]

commit 6862eada65a6f41304b32c3d4fca3da9c240d5bd
Merge: f794b40ec 0bfd1c318
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 1 11:19:29 2017 -0400

    Merge branch 'maint-0.2.5' into maint-0.2.6

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