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

[nickm at torproject.org]

commit adf46d69e724f6857464131555267fa01554629f
Merge: 94dad8d d642ceb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 8 10:12:18 2017 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9

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