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

[mikeperry at torproject.org]

commit b3e9b161754d788154f033dd3faf71eb38f34f3f
Merge: f85d4d1 fc393b4
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Tue Apr 8 14:49:14 2014 -0700

    Merge branch 'maint-2.4'

 build-scripts/recommended-versions |    6 ++++++
 1 file changed, 6 insertions(+)