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

[nickm at torproject.org]

commit f99a64eea6b24180bf58d66f3bd3d6dca55aaebd
Merge: 22605529b 90de776ea
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 2 08:01:33 2019 -0400

    Merge branch 'maint-0.2.9' into release-0.2.9

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