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

[nickm at torproject.org]

commit 8042c356f4904107b0357d95d19f2c72f1d13cb5
Merge: 16fd975a8 26e28829d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 8 09:34:56 2018 -0500

    Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/geoip-2018-01-05 |     4 +
 src/config/geoip         | 31441 ++++++++++-----------------------------------
 src/config/geoip6        |   753 +-
 3 files changed, 7587 insertions(+), 24611 deletions(-)