[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

[nickm at torproject.org]

commit 3d18903f53081cc31bd74d10632d1319ed5eba48
Merge: d7259b64d ba71b1786
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 7 08:43:45 2019 -0500

    Merge branch 'maint-0.3.3' into maint-0.3.4

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