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

Fri Nov 15 20:20:10 UTC 2013

commit da1ec9ff6d0dd38c9b9657019a313e1968917744
Merge: ea59f69 95791be
Author: Erinn Clark <erinn at torproject.org>
Date:   Fri Nov 15 18:20:29 2013 -0200

    Merge branch 'maint-2.4'

 build-scripts/config/Info.plist         |    6 +++---
 build-scripts/config/Info.plist-stable  |    6 +++---
 build-scripts/config/mozconfig-lin-i386 |   16 ----------------
 build-scripts/linux-alpha.mk            |    2 +-
 build-scripts/osx-alpha.mk              |    5 +++--
 build-scripts/osx.mk                    |    3 ++-
 build-scripts/windows-alpha.mk          |    2 +-
 changelog.linux-2.3                     |    7 +++++++
 changelog.linux-2.4                     |    8 ++++++++
 changelog.osx-2.3                       |    9 +++++++++
 changelog.osx-2.4                       |   10 ++++++++++
 changelog.windows-2.3                   |    7 +++++++
 changelog.windows-2.4                   |    8 ++++++++
 src/current-patches/osx/macosx-tor.sh   |    8 ++++++++
 14 files changed, 70 insertions(+), 27 deletions(-)