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

[nickm at torproject.org]

commit e4b793fe41fc09cc1f7753cfe90b74095a49a34f
Merge: d82ffb7 2639fd0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 7 09:32:00 2016 -0500

    Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/geoip-november2016 |    4 +
 src/config/geoip           | 4025 ++++++++++++++++++++++++++++----------------
 src/config/geoip6          | 2490 ++++++++++-----------------
 3 files changed, 3407 insertions(+), 3112 deletions(-)