commit 124062e84339ac16ca007a1dc3227951eadcf35b Merge: 2ce4330 f601605 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Feb 13 14:37:01 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-february2017 | 4 + src/config/geoip | 10832 ++++++++++++++++++++++++------------------- src/config/geoip6 | 1651 ++++++- 3 files changed, 7351 insertions(+), 5136 deletions(-)