commit f4e033288e929c9e1cb2ca5b374b70cd363cff31 Merge: fd59766a9 c9b76a12f Author: Nick Mathewson nickm@torproject.org Date: Sat Nov 11 12:23:33 2017 -0500

Merge branch 'maint-0.2.8' into release-0.2.8

changes/geoip-2017-11-06 | 4 + src/config/geoip | 9406 ++++++++++++++++++++++++++++------------------ src/config/geoip6 | 848 ++++- 3 files changed, 6426 insertions(+), 3832 deletions(-)