commit 9a998e1d0fa30c7f3e35d529d639a8f0dd199d4f Merge: b58faf1 56a2b8d Author: Nick Mathewson <nickm@torproject.org> Date: Fri Dec 9 08:35:02 2016 -0500 Merge branch 'maint-0.2.8' into release-0.2.8 changes/geoip-december2016 | 4 + src/config/geoip | 6259 ++++++++++++++++++++++++++------------------ src/config/geoip6 | 1193 ++++++++- 3 files changed, 4705 insertions(+), 2751 deletions(-)