[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.4' into maint-0.2.5

[nickm at torproject.org]

commit 2e5220cb8b34b614fa10102899841247e906fb7b
Merge: 1a540b5 4ee48cb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 5 14:38:54 2017 -0400

    Merge branch 'maint-0.2.4' into maint-0.2.5

 src/or/geoip.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)