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

[nickm at torproject.org]

commit ab98c4387eadf380f6fe71b8dc1b568704a379ea
Merge: ec19ecc ec718aa
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Oct 6 09:59:42 2016 -0400

    Merge branch 'maint-0.2.7' into maint-0.2.8

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