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

[erinn at torproject.org]

commit 82387145d92da54bd841f23dd839ce0b53945cdd
Merge: 53027b6 19ca165
Author: Erinn Clark <erinn at torproject.org>
Date:   Wed Nov 20 18:34:29 2013 -0200

    Merge branch 'maint-2.4'

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