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

[nickm at torproject.org]

commit 73371db4b9f82e541150b9f66de45be092fb7a76
Merge: c0c6854 ecc73c3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 8 10:10:55 2017 -0500

    Merge branch 'maint-0.2.6' into release-0.2.6

 changes/geoip-march2017 |     4 +
 src/config/geoip        | 13115 +++++++++++++++++++---------------------------
 src/config/geoip6       |   754 ++-
 3 files changed, 5884 insertions(+), 7989 deletions(-)