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

[mikeperry at torproject.org]

commit 920c4d378e738af8ccada960a79d76ac2c2d2b79
Merge: 9ea1d5d 907793b
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Fri Feb 14 13:00:44 2014 +0000

    Merge branch 'maint-2.4'

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