[tor-commits] [tor/master] Merge branch 'maint-0.2.9'

[nickm at torproject.org]

commit c7936b86c21489e9572485e62c96a5195a952f7b
Merge: 655ffea 0809690
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 11 09:13:53 2017 -0500

    Merge branch 'maint-0.2.9'

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