commit ae223138fbdd28ef452191c3a489e25e9a9b22c7 Merge: c3d11b1 1496056 Author: Nick Mathewson nickm@torproject.org Date: Thu Jan 7 09:13:54 2016 -0800

Merge branch 'maint-0.2.4' into maint-0.2.5

changes/geoip-january2016 | 4 + src/config/geoip | 1734 +++++++++++++++++++++++++++++++++++---------- src/config/geoip6 | 881 +++++++++++++++++------ 3 files changed, 2016 insertions(+), 603 deletions(-)