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

[nickm at torproject.org]

commit fe26e1f1c83b641827da7794beb4faf23fad6e97
Merge: 41e3c760a 85c5f5850
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 7 08:43:46 2019 -0500

    Merge branch 'maint-0.3.5'

 changes/geoip-2019-01-03 |     4 +
 src/config/geoip         | 12599 ++++++++++++++++++++++-----------------------
 src/config/geoip6        |  1764 ++++---
 3 files changed, 7458 insertions(+), 6909 deletions(-)