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

[nickm at torproject.org]

commit d6bdec1595751eba397d2ea20318538fcfb9c78a
Merge: 8e52c4658 b9d9b16b7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Oct 5 11:03:35 2017 -0400

    Merge branch 'maint-0.2.5' into maint-0.2.8

 changes/geoip-october2017 |    4 +
 src/config/geoip          | 8683 +++++++++++++++++++++++++++------------------
 src/config/geoip6         |  653 ++--
 3 files changed, 5654 insertions(+), 3686 deletions(-)