commit 95a9ea0a59f98379cf109a7868774cc5ab4a99fa Merge: 920c4d3 7b7206d Author: Mike Perry mikeperry-git@torproject.org Date: Mon Mar 3 19:02:02 2014 -0800

Merge branch 'maint-2.4'

build-scripts/recommended-versions | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)