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

[nickm at torproject.org]

commit f84a5e8a9184d6708b7deeb0fd00e2283e37429c
Merge: 4f7b4b2 c28ba99
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 5 12:25:17 2016 -0400

    Merge branch 'maint-0.2.6' into release-0.2.6

 changes/geoip-jun2016 |    4 +
 changes/geoip-may2016 |    4 +
 src/config/geoip      | 9624 +++++++++++++++++++++++++++++++------------------
 src/config/geoip6     | 2120 ++++++++---
 src/or/config.c       |    3 -
 5 files changed, 7725 insertions(+), 4030 deletions(-)