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

[erinn at torproject.org]

commit ea59f6997f36a6ee417533032845755fc71bf135
Merge: a860ada eb17a2b
Author: Erinn Clark <erinn at torproject.org>
Date:   Thu Nov 14 17:55:24 2013 -0200

    Merge branch 'maint-2.4'

 build-scripts/config/mozconfig-lin-i686 |   16 ++++++++++++++++
 1 file changed, 16 insertions(+)