commit 84049425727a9c8d49e4c63fc8c2a44c6f052cc8 Merge: dd7a02a eebd740 Author: Erinn Clark erinn@torproject.org Date: Fri Dec 20 19:15:56 2013 -0200

Merge branch 'maint-2.4'

build-scripts/linux-alpha.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)