commit e8e89fd7a180ec54a8bdc4de09b69a4dc8f38f7d Merge: 3569cff dbb919c Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 7 10:10:21 2015 -0500

Merge branch 'maint-0.2.4' into maint-0.2.5

changes/geoip-december2015 | 4 + src/config/geoip | 4547 ++++++++++++++++++++++++++++++++------------ src/config/geoip6 | 2580 +++++++++++++++++++++---- 3 files changed, 5512 insertions(+), 1619 deletions(-)