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

[erinn at torproject.org]

commit 25a4e60f753e3bbdf4c4583188921dbf4d689bc8
Merge: a59fe69 3dc0f94
Author: Erinn Clark <erinn at torproject.org>
Date:   Wed Oct 30 20:25:33 2013 -0200

    Merge branch 'maint-2.4'

 README.LINUX-2.3                       |    6 +++---
 README.OSX-2.3                         |    6 +++---
 README.WIN-2.3                         |    6 +++---
 build-scripts/config/Info.plist        |    6 +++---
 build-scripts/config/Info.plist-stable |    6 +++---
 build-scripts/linux-alpha.mk           |    2 +-
 build-scripts/linux.mk                 |    2 +-
 build-scripts/osx-alpha.mk             |    2 +-
 build-scripts/osx.mk                   |    2 +-
 build-scripts/versions-alpha.mk        |    8 ++++----
 build-scripts/versions.mk              |    8 ++++----
 build-scripts/windows-alpha.mk         |    2 +-
 build-scripts/windows.mk               |    2 +-
 changelog.linux-2.3                    |    9 +++++++++
 changelog.linux-2.4                    |   10 ++++++++++
 changelog.osx-2.3                      |    8 ++++++++
 changelog.osx-2.4                      |    9 +++++++++
 changelog.windows-2.3                  |    9 +++++++++
 changelog.windows-2.4                  |    9 +++++++++
 19 files changed, 83 insertions(+), 29 deletions(-)