commit f875cd712491a96b72f7b3c3273cbc04923d7c91 Merge: a4d5ce4 d75be18 Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 5 12:02:22 2017 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

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