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

[nickm at torproject.org]

commit 17cfdb358cae63477a120182784599dae0538cd7
Merge: 67e5d49 443dddb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 9 10:36:50 2016 -0500

    Merge branch 'maint-0.2.6' into maint-0.2.7

 changes/geoip-march2016 |    4 +
 src/config/geoip        | 8496 +++++++++++++++++++++++++++++++----------------
 src/config/geoip6       | 2270 ++++++-------
 3 files changed, 6524 insertions(+), 4246 deletions(-)