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

[nickm at torproject.org]

commit 834eef2452a667c5557e5a09bb879cc2fc98a661
Merge: 5acfc3087 b68e636b3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 5 08:22:34 2018 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/geoip-2018-04-03 |     4 +
 src/config/geoip         | 39253 ++++++++++++++++++++++++++++++++++-----------
 src/config/geoip6        |  5391 +++----
 3 files changed, 31480 insertions(+), 13168 deletions(-)