commit 8714e98e88627cda6bbbfa6103147373695c91f9 Merge: 3ce2d8c4a 6b2ff4fff Author: Nick Mathewson nickm@torproject.org Date: Sun Nov 11 11:57:53 2018 -0500

Merge branch 'maint-0.3.4' into release-0.3.4

changes/geoip-2018-11-06 | 4 + src/config/geoip | 22164 +++++++++++++++++++++++---------------------- src/config/geoip6 | 2572 ++++-- 3 files changed, 13068 insertions(+), 11672 deletions(-)