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

[nickm at torproject.org]

commit 12a72983766d5265b5259038af711cb172671af7
Merge: 52a99cb 304d8f3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Oct 6 09:59:03 2016 -0400

    Merge branch 'maint-0.2.5' into maint-0.2.6

 changes/geoip-october2016 |     4 +
 src/config/geoip          | 63919 +++++++++++++++++++++++++++++++++-----------
 src/config/geoip6         |  1496 +-
 3 files changed, 48664 insertions(+), 16755 deletions(-)