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

[erinn at torproject.org]

commit 25aefdb61c770a0d721cef63b24106466ccaad40
Merge: 7d76df2 fd37046
Author: Erinn Clark <erinn at torproject.org>
Date:   Fri Jun 21 19:23:09 2013 -0300

    Merge branch 'maint-2.4'

 README.LINUX-2.3                            |    4 ++--
 README.LINUX-2.4                            |    2 +-
 README.OSX-2.3                              |    8 ++++----
 README.OSX-2.4                              |    2 +-
 README.WIN-2.3                              |    8 ++++----
 README.WIN-2.4                              |    2 +-
 build-scripts/config/extension-overrides.js |    1 +
 build-scripts/linux.mk                      |    2 +-
 build-scripts/osx.mk                        |    2 +-
 build-scripts/versions-alpha.mk             |    2 +-
 build-scripts/versions.mk                   |    8 ++++----
 build-scripts/windows.mk                    |    2 +-
 changelog.linux-2.3                         |    8 ++++++++
 changelog.linux-2.4                         |    3 ++-
 changelog.osx-2.3                           |    9 +++++++++
 changelog.osx-2.4                           |    3 ++-
 changelog.windows-2.3                       |    9 +++++++++
 changelog.windows-2.4                       |    3 ++-
 18 files changed, 54 insertions(+), 24 deletions(-)