[tor-commits] [tor/release-0.4.1] Merge branch 'maint-0.2.9' into maint-0.3.5

[nickm at torproject.org]

commit 7b9cb4c47bc9d1ca4e120af2b00a0f0747cd7b20
Merge: 02840169d 90de776ea
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 2 08:01:33 2019 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.5

 changes/geoip-2019-10-01 |     4 +
 src/config/geoip         | 35299 ++++++++++++++++++++++++++-------------------
 src/config/geoip6        |  8318 ++++++++---
 3 files changed, 26359 insertions(+), 17262 deletions(-)