commit 33b500851c3476298f4a243374216258a4cf56e8 Merge: df842d8 33fcc0f Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 5 12:01:27 2017 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

changes/bug22490 | 3 +++ src/or/geoip.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)