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

[erinn at torproject.org]

commit 80fa9ed81cbd848822f0fb68a72232c3834d2f32
Merge: 569f21d 8e02d3a
Author: Erinn Clark <erinn at torproject.org>
Date:   Wed Nov 6 09:43:56 2013 -0200

    Merge branch 'maint-2.4'

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