commit ef2678cb239930063ed601f41d785b9a2a1e3de2 Merge: 8238714 aec6ab3 Author: Mike Perry mikeperry-git@torproject.org Date: Thu Nov 21 21:25:08 2013 -0800

Merge branch 'maint-2.4'

build-scripts/recommended-versions | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)