[tor-commits] [tor/master] Merge branch 'maint-0.3.5'

[nickm at torproject.org]

commit e27dff08a344fdd31ac0ab6827deb5b501093bce
Merge: 91355c0fa 76ed869ff
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Nov 11 11:57:54 2018 -0500

    Merge branch 'maint-0.3.5'

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