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

[nickm at torproject.org]

commit f5fdf188b9c2e218e89f55e4fb26fcd3b2abe44b
Merge: ec718aa 6c2174d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 7 09:30:42 2016 -0500

    Merge branch 'maint-0.2.6' into maint-0.2.7

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