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

[nickm at torproject.org]

commit 443dddb74966eea0b30231b9f18b80b9372f2210
Merge: 740421a 21f9829
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 9 10:36:35 2016 -0500

    Merge branch 'maint-0.2.5' into maint-0.2.6

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