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

[erinn at torproject.org]

commit e707045d480f976522e0fad04ae93e63810e2ae6
Merge: 9ce7869 70be560
Author: Erinn Clark <erinn at torproject.org>
Date:   Mon Nov 11 13:21:29 2013 -0200

    Merge branch 'maint-2.4'

 build-scripts/config/mozconfig-lin-i386   |   16 ++++++++++++++++
 build-scripts/config/mozconfig-lin-x86_64 |   16 ++++++++++++++++
 build-scripts/config/mozconfig-win        |   16 ++++++++++++++++
 build-scripts/linux-alpha.mk              |    4 ++--
 build-scripts/linux.mk                    |    4 ++--
 build-scripts/windows-alpha.mk            |    4 ++--
 build-scripts/windows.mk                  |    4 ++--
 7 files changed, 56 insertions(+), 8 deletions(-)