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

[erinn at torproject.org]

commit 53027b65987af5a5731fde0c493652f75130b4f7
Merge: dc7ca53 428a550
Author: Erinn Clark <erinn at torproject.org>
Date:   Wed Nov 20 17:53:33 2013 -0200

    Merge branch 'maint-2.4'

 build-scripts/config/mozconfig-lin-x86_64 |    2 +-
 build-scripts/linux-alpha.mk              |    2 +-
 build-scripts/linux.mk                    |    2 +-
 changelog.linux-2.3                       |    7 +++++++
 changelog.linux-2.4                       |    7 +++++++
 5 files changed, 17 insertions(+), 3 deletions(-)