commit e7034847225b1ca39dfb122e04006728d31f8db6 Merge: d5b3679 d8a056d Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 7 10:46:15 2016 -0400

Merge branch 'maint-0.2.8'

changes/geoip-april2016 | 4 + src/config/geoip | 3255 +++++++++++++++++++++++++++++++++++------------ src/config/geoip6 | 2549 +++++++++++++++++++++++++++++-------- 3 files changed, 4455 insertions(+), 1353 deletions(-)