commit 6a342154607e6267b2cd5507f72843238846e543 Merge: 27c55d887 155b0f552 Author: Nick Mathewson nickm@torproject.org Date: Wed Mar 6 14:29:36 2019 -0500

Merge branch 'maint-0.3.4' into release-0.3.4

changes/geoip-2019-03-04 | 4 + src/config/geoip | 12163 ++++++++++++++++++++++++--------------------- src/config/geoip6 | 2251 ++++++--- 3 files changed, 8221 insertions(+), 6197 deletions(-)