[tor-commits] [tor/release-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6

[nickm at torproject.org]

commit fb5a858a350e8801ee97e6323d0814e805d2f6ec
Merge: 9d86f66 809217e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 24 10:06:15 2015 -0400

    Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6

 changes/geoip-september2015 |    3 +
 src/config/geoip            | 3977 ++++++++++++++++++++++++++++++++-----------
 src/config/geoip6           | 2594 ++++++++++++++++------------
 3 files changed, 4505 insertions(+), 2069 deletions(-)