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

[nickm at torproject.org]

commit 80fb1ef8ba8406f7ed335d7ffd06cdf058cca80f
Merge: 3149bfc 418b6f8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 25 11:46:16 2015 -0400

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

 changes/geoip-june2015  |    3 +
 changes/geoip6-june2015 |    3 +
 src/config/geoip        |14347 +++++++++++++++++++++++------------------------
 src/config/geoip6       | 2282 +++++---
 4 files changed, 8560 insertions(+), 8075 deletions(-)