commit 558eafe56e0d3fd0d769a330cecc9f02f85aa8a6 Merge: e2979ebe2 2e21493a8 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Oct 5 11:04:59 2017 -0400 Merge branch 'maint-0.2.5' into release-0.2.5 changes/geoip-october2017 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)