commit adec001c9a1e173e647b9b74ee4fb82871f86cb3 Merge: 254535a14 d6bdec159 Author: Nick Mathewson nickm@torproject.org Date: Thu Oct 5 11:03:35 2017 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

changes/geoip-october2017 | 4 + src/config/geoip | 8683 +++++++++++++++++++++++++++------------------ src/config/geoip6 | 653 ++-- 3 files changed, 5654 insertions(+), 3686 deletions(-)