commit 3d2d3f2b62a361552f893b85e5b0d356be0a9261 Merge: db2571b 9db47e7 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Dec 9 08:33:57 2016 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-december2016 | 4 + src/config/geoip | 6259 ++++++++++++++++++++++++++------------------ src/config/geoip6 | 1193 ++++++++- 3 files changed, 4705 insertions(+), 2751 deletions(-)