commit 3c28f65fde9d32154ea790d644d5e090fddbf6b8 Merge: b3e9b16 ba9d6b2 Author: Mike Perry mikeperry-git@torproject.org Date: Tue Apr 8 16:05:15 2014 -0700

Merge branch 'maint-2.4'

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