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

[erinn at torproject.org]

commit 569f21d891a99695905180934b84427d665f5e19
Merge: 7596949 a536137
Author: Erinn Clark <erinn at torproject.org>
Date:   Fri Nov 1 19:59:32 2013 -0200

    Merge branch 'maint-2.4'

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