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

[nickm at torproject.org]

commit 01bb260f3108688f2ca54b1eea813980dd94ea1f
Merge: fd082c3 7004d67
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 29 10:47:07 2015 -0400

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

 changes/geoip-july2015 |    3 +
 src/config/geoip       | 2975 ++++++++++++++++++++++++++++++++++--------------
 src/config/geoip6      |  405 ++++---
 3 files changed, 2387 insertions(+), 996 deletions(-)