[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.6'

commit 7b7cb0d779ee3ea9ff9e1cd8682662c3d0ce6813 Merge: 8b1f88e 9d86f66 Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 29 10:48:29 2015 -0400

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

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