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

[nickm at torproject.org]

commit fe4c08bb158a3146cb6346b55dc2f94e6728e0fa
Merge: 7c97a87dd fe19b40fe
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 9 08:46:25 2018 -0400

    Merge branch 'maint-0.2.9' into release-0.2.9

 changes/geoip-2018-08-07 |     4 +
 src/config/geoip         | 14291 ++++++++++++++++++++++++++-------------------
 src/config/geoip6        |   974 ++-
 3 files changed, 9063 insertions(+), 6206 deletions(-)