commit 0b571cff238a3f803314d94b07945784761be002 Merge: a49be99 3d9f8ff Author: Nick Mathewson <nickm@torproject.org> Date: Fri Dec 9 08:34:51 2016 -0500 Merge branch 'maint-0.2.6' into release-0.2.6 changes/geoip-december2016 | 4 + src/config/geoip | 6259 ++++++++++++++++++++++++++------------------ src/config/geoip6 | 1193 ++++++++- 3 files changed, 4705 insertions(+), 2751 deletions(-)