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

[nickm at torproject.org]

commit ded2c8c6894e6de2784e60d0d9cafec911fc9b9b
Merge: 552bc39 d642ceb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 8 10:12:27 2017 -0500

    Merge branch 'maint-0.2.9' into maint-0.3.0

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