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

[nickm at torproject.org]

commit 75fe218b166b4d4e46b50205104e9eeaa136e904
Merge: 4bce207 43c18b1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 13 14:37:49 2017 -0500

    Merge branch 'maint-0.2.6' into maint-0.2.7

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