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

[mikeperry at torproject.org]

commit 6a86d533a10f1bcd3580f25d9529a845efefafbf
Merge: 919aae1 e33b779
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Tue Sep 24 20:49:00 2013 -0700

    Merge branch 'maint-2.4'

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