commit 85c5f58509898bf8236ccb8998556f1ab688cb05 Merge: 74bda3079 3d18903f5 Author: Nick Mathewson nickm@torproject.org Date: Mon Jan 7 08:43:46 2019 -0500

Merge branch 'maint-0.3.4' into 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(-)