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

[nickm at torproject.org]

commit 2ccb9e9444be568cbd1552a0ea86ec58bc4a92e1
Merge: 46a321fbd c1f86f749
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 6 09:26:34 2018 -0500

    Merge branch 'maint-0.3.5'

 changes/geoip-2018-12-05 |     4 +
 src/config/geoip         | 10100 +++++++++++++++++++++++++++------------------
 src/config/geoip6        |  3151 +++++++++-----
 3 files changed, 8147 insertions(+), 5108 deletions(-)