commit 6c2174d44d01b4c231befe9de5ce2ffb042cc65d Merge: 12a7298 db2571b Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 7 09:30:16 2016 -0500

Merge branch 'maint-0.2.5' into maint-0.2.6

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