commit a286fbd711a6fb197cb95150be57edae3034ca43 Merge: 2f962b9 306f2f0 Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 9 16:24:54 2015 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

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