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

[nickm at torproject.org]

commit 0809690b481b37fae56a65171e6507e30e763bfa
Merge: c27ae62 c77ace6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 11 09:13:34 2017 -0500

    Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/geoip-january2017 |    4 +
 src/config/geoip          | 3160 +++++++++++++++++++++++++++++----------------
 src/config/geoip6         |  561 +++++++-
 3 files changed, 2552 insertions(+), 1173 deletions(-)