commit d1169bc91dae29e701512597cd75e8fb31a27136 Merge: 529eac4 ad816ea Author: Mike Perry mikeperry-git@torproject.org Date: Mon Jan 27 20:44:21 2014 -0800

Merge branch 'maint-2.4'

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