commit 2639fd08e7212bb33c0964b57028c013ce2271aa Merge: 61bdc45 f5fdf18 Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 7 09:31:36 2016 -0500

Merge branch 'maint-0.2.7' into maint-0.2.8

changes/geoip-november2016 | 4 + src/config/geoip | 4025 ++++++++++++++++++++++++++++---------------- src/config/geoip6 | 2490 ++++++++++----------------- 3 files changed, 3407 insertions(+), 3112 deletions(-)