[tbb-commits] [tor-browser/tor-browser-24.7.0esr-4.x-2] Merge remote-tracking branch 'brade/bug4234-05' into tor-browser-24.7.0esr-4.x-2

[mikeperry at torproject.org]

commit 3b338aadd92ac0c3d9584fceea28f8934cdf20f0
Merge: 88d5119 43c5ec5
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Wed Aug 27 23:44:37 2014 -0700

    Merge remote-tracking branch 'brade/bug4234-05' into tor-browser-24.7.0esr-4.x-2

 .mozconfig                                         |    5 +-
 .mozconfig-mac                                     |    6 +-
 .mozconfig-mingw                                   |    5 +-
 accessible/src/Makefile.in                         |    2 +-
 accessible/src/shared.mozbuild                     |    2 +-
 browser/app/profile/000-tor-browser.js             |    8 +-
 browser/app/profile/firefox.js                     |   11 +-
 browser/base/content/aboutDialog.js                |   45 +++-
 browser/branding/official/pref/firefox-branding.js |    4 +-
 browser/confvars.sh                                |   19 +-
 browser/installer/Makefile.in                      |    4 +
 browser/installer/removed-files.in                 |    4 +-
 config/createprecomplete.py                        |   14 +-
 configure.in                                       |   28 ++-
 js/src/configure.in                                |    3 -
 toolkit/modules/debug.js                           |    1 +
 toolkit/mozapps/extensions/Makefile.in             |    2 +-
 toolkit/mozapps/update/common/updatedefines.h      |    1 +
 toolkit/mozapps/update/common/updatehelper.cpp     |    2 -
 toolkit/mozapps/update/nsUpdateService.js          |   68 ++++-
 toolkit/mozapps/update/test/Makefile.in            |    6 +
 toolkit/mozapps/update/test/TestAUSHelper.cpp      |    2 -
 toolkit/mozapps/update/updater/Makefile.in         |    7 +
 toolkit/mozapps/update/updater/updater.cpp         |  262 +++++++++++++++++---
 toolkit/xre/nsAppRunner.cpp                        |   10 +-
 toolkit/xre/nsUpdateDriver.cpp                     |   39 +++
 tools/update-packaging/common.sh                   |   62 ++++-
 tools/update-packaging/make_full_update.sh         |   40 ++-
 tools/update-packaging/make_incremental_update.sh  |   62 ++++-
 29 files changed, 595 insertions(+), 129 deletions(-)