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

[nickm at torproject.org]

commit 08ed0d79308b308f690b80d65b22be11a97caf09
Merge: d3b7a2bd2 c604a76a5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Dec 20 12:15:24 2017 -0500

    Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/geoip-2017-12-06 |     4 +
 src/config/geoip         | 12380 +++++++++++++++++++++++++++------------------
 src/config/geoip6        |  3373 +++++++++---
 3 files changed, 10033 insertions(+), 5724 deletions(-)