commit 517d9fec4b6d464d276410385942323124488255 Author: Nicolas Vigier boklm@torproject.org Date: Mon Oct 26 18:05:33 2015 +0100

fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.

Bug #17305: add the hardened channel --- toolkit/modules/debug.js | 1 + toolkit/mozapps/extensions/moz.build | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/toolkit/modules/debug.js b/toolkit/modules/debug.js index a30b586..486105e 100644 --- a/toolkit/modules/debug.js +++ b/toolkit/modules/debug.js @@ -42,6 +42,7 @@ this.NS_ASSERT = function NS_ASSERT(condition, message) { case "nightly": case "aurora": case "alpha": + case "hardened": case "beta": case "default": releaseBuild = false; diff --git a/toolkit/mozapps/extensions/moz.build b/toolkit/mozapps/extensions/moz.build index c6a072c..58f8c3f 100644 --- a/toolkit/mozapps/extensions/moz.build +++ b/toolkit/mozapps/extensions/moz.build @@ -38,7 +38,7 @@ EXTRA_PP_JS_MODULES += [ 'AddonManager.jsm' ]

-if CONFIG['MOZ_UPDATE_CHANNEL'] not in ('aurora', 'alpha', 'beta', 'release', 'esr'): +if CONFIG['MOZ_UPDATE_CHANNEL'] not in ('aurora', 'alpha', 'beta', 'hardened', 'release', 'esr'): DEFINES['MOZ_COMPATIBILITY_NIGHTLY'] = 1

# Additional debugging info is exposed in debug builds