commit 9617b596ba9c88d0f6f687439bf0059323e22c1d Merge: 78b85f760 76ed869ff Author: Nick Mathewson nickm@torproject.org Date: Sun Nov 11 11:57:54 2018 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

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