[tor-commits] [torbrowser/master] Merge branch 'maint-2.4'

[mikeperry at torproject.org]

commit 9ea1d5d435cdbf1b256128c1e5064b73c740eea8
Merge: d1169bc 76a2799
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Mon Feb 10 11:02:16 2014 -0800

    Merge branch 'maint-2.4'

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