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

[erinn at torproject.org]

commit b5d81d038b5935a205be91e5314c997561188367
Merge: 6100d4c cde9241
Author: Erinn Clark <erinn at torproject.org>
Date:   Wed Dec 18 20:54:32 2013 -0200

    Merge branch 'maint-2.4'

 build-scripts/config/vidalia.conf.standalone       |    7 +++++
 build-scripts/config/vidalia.conf.standalone-linux |    8 +++++
 build-scripts/config/vidalia.conf.standalone-osx   |    7 +++++
 build-scripts/linux-alpha.mk                       |   31 ++++++++++++++++--
 build-scripts/linux.mk                             |    4 +--
 build-scripts/osx-alpha.mk                         |   33 ++++++++++++++++++--
 build-scripts/osx.mk                               |    4 +--
 build-scripts/recommended-versions                 |    5 ++-
 build-scripts/windows-alpha.mk                     |   33 ++++++++++++++++++--
 build-scripts/windows.mk                           |    4 +--
 src/RelativeLink/vidalia/start-vidalia-osx.sh      |    3 ++
 src/RelativeLink/vidalia/start-vidalia.sh          |    4 +++
 12 files changed, 130 insertions(+), 13 deletions(-)