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

[nickm at torproject.org]

commit 28c95ed3fa2e9205cd78c6dc5f5a021249f7b543
Merge: 366e9ba84 3d18903f5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 7 08:43:45 2019 -0500

    Merge branch 'maint-0.3.4' into release-0.3.4

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