commit 98f610068f669cabbd2fde764c79e8c9d0481976 Merge: df23e28 4ee48cb Author: Nick Mathewson <nickm@torproject.org> Date: Mon Jun 5 14:38:48 2017 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 src/or/geoip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)