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

[nickm at torproject.org]

commit 8cdb8f97ae4ecc11f2eb203382a32b777fbe2d36
Merge: f89eb4a02 2e74edb53
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 6 14:29:26 2019 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9

 changes/geoip-2019-03-04 |     4 +
 src/config/geoip         | 12163 ++++++++++++++++++++++++---------------------
 src/config/geoip6        |  2251 ++++++---
 3 files changed, 8221 insertions(+), 6197 deletions(-)