commit e49ec773d1572eed2f02f83bba61d6383810d0a1 Merge: dac74fbfa b7b467d3a Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 6 16:02:06 2019 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

changes/geoip-2019-12-03 | 4 + src/config/geoip | 13933 ++++++++++++++++++++++++++------------------- src/config/geoip6 | 4621 ++++++++------- 3 files changed, 10717 insertions(+), 7841 deletions(-)