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

[nickm at torproject.org]

commit d7052dd4803c4da4da2b9af1d277cdbaf77b8040
Merge: 70bade0d1 2e770216c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 12 09:56:50 2019 -0500

    Merge branch 'maint-0.3.5' into release-0.3.5

 changes/geoip-2019-02-05 |     4 +
 src/config/geoip         | 22020 ++++++++++++++++++++++++++++++++-------------
 src/config/geoip6        |  2401 +++--
 3 files changed, 16972 insertions(+), 7453 deletions(-)