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

commit 59f4c410879961e77c1ec3f8937f1af7af1b011b Merge: e3b6373 7c9be64 Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 9 16:25:41 2015 -0400

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

changes/geoip-march2015 | 3 + changes/geoip6-march2015 | 3 + src/config/geoip |12695 ++++++++++++++++++++++++++++++++++------------ src/config/geoip6 | 1228 ++++- 4 files changed, 10398 insertions(+), 3531 deletions(-)