commit b68e636b3368feb48444fd2f652ca279ddb73946 Merge: 4bb7d9fd1 1fa396b0a Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 5 08:22:33 2018 -0400

Merge branch 'maint-0.2.5' into maint-0.2.9

changes/geoip-2018-04-03 | 4 + src/config/geoip | 39253 ++++++++++++++++++++++++++++++++++----------- src/config/geoip6 | 5391 +++---- 3 files changed, 31480 insertions(+), 13168 deletions(-)