commit 54771bcaba592530d5759832beb868afba1b9595 Merge: b6227ed 34fdd51 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jan 11 09:12:21 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/geoip-january2017 | 4 + src/config/geoip | 3160 +++++++++++++++++++++++++++++---------------- src/config/geoip6 | 561 +++++++- 3 files changed, 2552 insertions(+), 1173 deletions(-)