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

[erinn at torproject.org]

commit f666aaa2ff5345debb7e64e7be7506c6ae8a849c
Merge: 346321e 33bf40c
Author: Erinn Clark <erinn at torproject.org>
Date:   Sun Aug 11 11:58:49 2013 +0200

    Merge branch 'maint-2.4'

 README.LINUX-2.4                       |    2 +-
 README.OSX-2.4                         |    2 +-
 README.WIN-2.4                         |    2 +-
 build-scripts/config/Info.plist        |    6 +++---
 build-scripts/config/Info.plist-stable |    6 +++---
 build-scripts/linux-alpha.mk           |    2 +-
 build-scripts/osx-alpha.mk             |    2 +-
 build-scripts/versions-alpha.mk        |    4 ++--
 build-scripts/windows-alpha.mk         |    2 +-
 changelog.linux-2.3                    |    7 +++++++
 changelog.linux-2.4                    |    8 ++++++++
 changelog.osx-2.3                      |    7 +++++++
 changelog.osx-2.4                      |    8 ++++++++
 changelog.windows-2.3                  |    7 +++++++
 changelog.windows-2.4                  |    8 ++++++++
 15 files changed, 59 insertions(+), 14 deletions(-)