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

[nickm at torproject.org]

commit 2c9ce8de3dcd649fae8ef75d120e6448c760d4cf
Merge: b77bc9a 0809690
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 11 09:13:44 2017 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9

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