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

[nickm at torproject.org]

commit 7beaaed245e99c57a5b35c266da4ff9fa5f2b113
Merge: 2abff832d 853b6ad09
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 11 10:14:03 2019 -0500

    Merge branch 'maint-0.2.9' into maint-0.3.5

 changes/geoip-2019-11-06 |     4 +
 src/config/geoip         | 15751 +++++++++++++++++++++++++++------------------
 src/config/geoip6        |  3078 ++++++---
 3 files changed, 11485 insertions(+), 7348 deletions(-)