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

[nickm at torproject.org]

commit d0c3723c38e0dba2ec1474c1c3ed75c6d0a7099f
Merge: c06b7f090 5ba3d09a8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Nov 11 11:57:52 2018 -0500

    Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/geoip-2018-11-06 |     4 +
 src/config/geoip         | 22164 +++++++++++++++++++++++----------------------
 src/config/geoip6        |  2572 ++++--
 3 files changed, 13068 insertions(+), 11672 deletions(-)