commit 5b90a0312d69e956e73f51550511ba5c7183369e Merge: 7c89a53 14671f6 Author: Mike Perry mikeperry-git@torproject.org Date: Thu Dec 19 16:11:58 2013 -0600

Merge branch 'maint-2.4'

build-scripts/recommended-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)