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

[nickm at torproject.org]

commit a86f95df5c34df2921e8f3e76f171c0576fc2a20
Merge: 23f1caf 9b90d51
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 13 14:38:03 2017 -0500

    Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/geoip-february2017 |     4 +
 src/config/geoip           | 10832 ++++++++++++++++++++++++-------------------
 src/config/geoip6          |  1651 ++++++-
 3 files changed, 7351 insertions(+), 5136 deletions(-)