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

[erinn at torproject.org]

commit dc7ca534f028825cab8f411e93cb23aabf695b18
Merge: e9152e6 3297949
Author: Erinn Clark <erinn at torproject.org>
Date:   Tue Nov 19 16:31:39 2013 -0200

    Merge branch 'maint-2.4'

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