- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-87.0-10.5-1] Bug 32220: Improve the letterboxing experience
by sysrqb＠torproject.org 24 Mar '21

24 Mar '21

commit 7b36eb101d731126471d7a02d521581216faf481 Author: Richard Pospesel <richard(a)torproject.org> Date: Mon Oct 28 17:42:17 2019 -0700 Bug 32220: Improve the letterboxing experience CSS and JS changes to alter the UX surrounding letterboxing. The browser element containing page content is now anchored to the bottom of the toolbar, and the remaining letterbox margin is the same color as the firefox chrome. The letterbox margin and border are tied to the currently selected theme. Also adds a 'needsLetterbox' property to tabbrowser.xml to fix a race condition present when using the 'isEmpty' property. Using 'isEmpty' as a proxy for 'needsLetterbox' resulted in over-zealous/unnecessary letterboxing of about:blank tabs. --- browser/base/content/browser.css | 8 ++ browser/base/content/tabbrowser-tab.js | 9 +++ browser/themes/shared/tabs.inc.css | 6 ++ .../components/resistfingerprinting/RFPHelper.jsm | 94 +++++++++++++++++++--- 4 files changed, 105 insertions(+), 12 deletions(-) diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css index 7b68594ef19b..d04649512e86 100644 --- a/browser/base/content/browser.css +++ b/browser/base/content/browser.css @@ -85,6 +85,14 @@ body { display: none; } + +.browserStack > browser.letterboxing { + border-color: var(--chrome-content-separator-color); + border-style: solid; + border-width : 1px; + border-top: none; +} + %ifdef MENUBAR_CAN_AUTOHIDE #toolbar-menubar[autohide="true"] { overflow: hidden; diff --git a/browser/base/content/tabbrowser-tab.js b/browser/base/content/tabbrowser-tab.js index 60a0e583fa46..45c4af3957ec 100644 --- a/browser/base/content/tabbrowser-tab.js +++ b/browser/base/content/tabbrowser-tab.js @@ -242,6 +242,15 @@ return true; } + get needsLetterbox() { + let browser = this.linkedBrowser; + if (isBlankPageURL(browser.currentURI.spec)) { + return false; + } + + return true; + } + get lastAccessed() { return this._lastAccessed == Infinity ? Date.now() : this._lastAccessed; } diff --git a/browser/themes/shared/tabs.inc.css b/browser/themes/shared/tabs.inc.css index 98dda4d7effc..605a313a7610 100644 --- a/browser/themes/shared/tabs.inc.css +++ b/browser/themes/shared/tabs.inc.css @@ -43,6 +43,12 @@ background-color: #f9f9fa; } +/* extend down the toolbar's colors when letterboxing is enabled*/ +#tabbrowser-tabpanels.letterboxing { + background-color: var(--toolbar-bgcolor); + background-image: var(--toolbar-bgimage); +} + :root[privatebrowsingmode=temporary] #tabbrowser-tabpanels { /* Value for --in-content-page-background in aboutPrivateBrowsing.css */ background-color: #25003e; diff --git a/toolkit/components/resistfingerprinting/RFPHelper.jsm b/toolkit/components/resistfingerprinting/RFPHelper.jsm index 166ad21e9013..9520d8720631 100644 --- a/toolkit/components/resistfingerprinting/RFPHelper.jsm +++ b/toolkit/components/resistfingerprinting/RFPHelper.jsm @@ -40,6 +40,7 @@ class _RFPHelper { // ============================================================================ constructor() { this._initialized = false; + this._borderDimensions = null; } init() { @@ -361,6 +362,24 @@ class _RFPHelper { }); } + getBorderDimensions(aBrowser) { + if (this._borderDimensions) { + return this._borderDimensions; + } + + const win = aBrowser.ownerGlobal; + const browserStyle = win.getComputedStyle(aBrowser); + + this._borderDimensions = { + top : parseInt(browserStyle.borderTopWidth), + right: parseInt(browserStyle.borderRightWidth), + bottom : parseInt(browserStyle.borderBottomWidth), + left : parseInt(browserStyle.borderLeftWidth), + }; + + return this._borderDimensions; + } + _addOrClearContentMargin(aBrowser) { let tab = aBrowser.getTabBrowser().getTabForBrowser(aBrowser); @@ -369,9 +388,13 @@ class _RFPHelper { return; } + // we add the letterboxing class even if the content does not need letterboxing + // in which case margins are set such that the borders are hidden + aBrowser.classList.add("letterboxing"); + // We should apply no margin around an empty tab or a tab with system // principal. - if (tab.isEmpty || aBrowser.contentPrincipal.isSystemPrincipal) { + if (!tab.needsLetterbox || aBrowser.contentPrincipal.isSystemPrincipal) { this._clearContentViewMargin(aBrowser); } else { this._roundContentView(aBrowser); @@ -539,10 +562,29 @@ class _RFPHelper { // Calculating the margins around the browser element in order to round the // content viewport. We will use a 200x100 stepping if the dimension set // is not given. - let margins = calcMargins(containerWidth, containerHeight); + + const borderDimensions = this.getBorderDimensions(aBrowser); + const marginDims = calcMargins(containerWidth, containerHeight - borderDimensions.top); + + let margins = { + top : 0, + right : 0, + bottom : 0, + left : 0, + }; + + // snap browser element to top + margins.top = 0; + // and leave 'double' margin at the bottom + margins.bottom = 2 * marginDims.height - borderDimensions.bottom; + // identical margins left and right + margins.right = marginDims.width - borderDimensions.right; + margins.left = marginDims.width - borderDimensions.left; + + const marginStyleString = `${margins.top}px ${margins.right}px ${margins.bottom}px ${margins.left}px`; // If the size of the content is already quantized, we do nothing. - if (aBrowser.style.margin == `${margins.height}px ${margins.width}px`) { + if (aBrowser.style.margin === marginStyleString) { log("_roundContentView[" + logId + "] is_rounded == true"); if (this._isLetterboxingTesting) { log( @@ -563,19 +605,35 @@ class _RFPHelper { "_roundContentView[" + logId + "] setting margins to " + - margins.width + - " x " + - margins.height + marginStyleString ); - // One cannot (easily) control the color of a margin unfortunately. - // An initial attempt to use a border instead of a margin resulted - // in offset event dispatching; so for now we use a colorless margin. - aBrowser.style.margin = `${margins.height}px ${margins.width}px`; + + // The margin background color is determined by the background color of the + // window's tabpanels#tabbrowser-tabpanels element + aBrowser.style.margin = marginStyleString; }); } _clearContentViewMargin(aBrowser) { + const borderDimensions = this.getBorderDimensions(aBrowser); + // set the margins such that the browser elements border is visible up top, but + // are rendered off-screen on the remaining sides + let margins = { + top : 0, + right : -borderDimensions.right, + bottom : -borderDimensions.bottom, + left : -borderDimensions.left, + }; + const marginStyleString = `${margins.top}px ${margins.right}px ${margins.bottom}px ${margins.left}px`; + + aBrowser.ownerGlobal.requestAnimationFrame(() => { + aBrowser.style.margin = marginStyleString; + }); + } + + _removeLetterboxing(aBrowser) { aBrowser.ownerGlobal.requestAnimationFrame(() => { + aBrowser.classList.remove("letterboxing"); aBrowser.style.margin = ""; }); } @@ -593,6 +651,11 @@ class _RFPHelper { aWindow.gBrowser.addTabsProgressListener(this); aWindow.addEventListener("TabOpen", this); + const tabPanel = aWindow.document.getElementById("tabbrowser-tabpanels"); + if (tabPanel) { + tabPanel.classList.add("letterboxing"); + } + // Rounding the content viewport. this._updateMarginsForTabsInWindow(aWindow); } @@ -616,10 +679,17 @@ class _RFPHelper { tabBrowser.removeTabsProgressListener(this); aWindow.removeEventListener("TabOpen", this); - // Clear all margins and tooltip for all browsers. + // revert tabpanel's background colors to default + const tabPanel = aWindow.document.getElementById("tabbrowser-tabpanels"); + if (tabPanel) { + tabPanel.classList.remove("letterboxing"); + } + + // and revert each browser element to default, + // restore default margins and remove letterboxing class for (let tab of tabBrowser.tabs) { let browser = tab.linkedBrowser; - this._clearContentViewMargin(browser); + this._removeLetterboxing(browser); } }

1 0

[tor-browser/tor-browser-87.0-10.5-1] Bug 27604: Fix addon issues when moving TB directory
by sysrqb＠torproject.org 24 Mar '21

24 Mar '21

commit 24c96165e9ed3b45628df1ff87a0de608881a0fe Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Oct 30 10:44:48 2019 +0100 Bug 27604: Fix addon issues when moving TB directory --- toolkit/mozapps/extensions/internal/XPIProvider.jsm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm index 4eec53e3b703..833d6f67a803 100644 --- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm +++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm @@ -472,7 +472,7 @@ class XPIState { // Builds prior to be 1512436 did not include the rootURI property. // If we're updating from such a build, add that property now. - if (!("rootURI" in this) && this.file) { + if (this.file) { this.rootURI = getURIForResourceInFile(this.file, "").spec; } @@ -485,7 +485,10 @@ class XPIState { saved.currentModifiedTime != this.lastModifiedTime ) { this.lastModifiedTime = saved.currentModifiedTime; - } else if (saved.currentModifiedTime === null) { + } else if ( + saved.currentModifiedTime === null && + (!this.file || !this.file.exists()) + ) { this.missing = true; } } @@ -1446,6 +1449,7 @@ var XPIStates = { if (shouldRestoreLocationData && oldState[loc.name]) { loc.restore(oldState[loc.name]); + changed = changed || loc.path != oldState[loc.name].path; } changed = changed || loc.changed;

1 0

[Git][tpo/applications/android-components] Pushed new branch android-components-73.0.11-10.5-1
by Matthew Finkel 24 Mar '21

24 Mar '21

Matthew Finkel pushed new branch android-components-73.0.11-10.5-1 at The Tor Project / Applications / android-components -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/tree/an… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/fenix] Pushed new branch tor-browser-87.0.0-10.5-1
by Matthew Finkel 24 Mar '21

24 Mar '21

Matthew Finkel pushed new branch tor-browser-87.0.0-10.5-1 at The Tor Project / Applications / fenix -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/tree/tor-browser-87.… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/fenix][tor-browser-87.0.0b2-10.5-1] Revert "Bug 40138: Add feedback survey card"
by Matthew Finkel 24 Mar '21

24 Mar '21

Matthew Finkel pushed to branch tor-browser-87.0.0b2-10.5-1 at The Tor Project / Applications / fenix Commits: 0f333548 by Matthew Finkel at 2021-03-23T21:39:10+00:00 Revert "Bug 40138: Add feedback survey card" This reverts commit 706838904ea883f56095d77f9dd484ab61f6480e. Bug 40151: Remove survey banner on TBA-stable - - - - - 11 changed files: - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlInteractor.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt - − app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TorFeedbackSurveyViewHolder.kt - app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt - − app/src/main/res/drawable/feedback_survey_padded_background.xml - − app/src/main/res/drawable/tor_survey_icon_3x.png - app/src/main/res/layout/fragment_home.xml - − app/src/main/res/layout/tor_feedback_survey.xml - app/src/main/res/values/colors.xml Changes: ===================================== app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt ===================================== @@ -23,7 +23,6 @@ import org.mozilla.fenix.home.sessioncontrol.viewholders.CollectionViewHolder import org.mozilla.fenix.home.sessioncontrol.viewholders.NoCollectionsMessageViewHolder import org.mozilla.fenix.home.sessioncontrol.viewholders.PrivateBrowsingDescriptionViewHolder import org.mozilla.fenix.home.sessioncontrol.viewholders.TorBootstrapPagerViewHolder -import org.mozilla.fenix.home.sessioncontrol.viewholders.TorFeedbackSurveyViewHolder import org.mozilla.fenix.home.sessioncontrol.viewholders.TabInCollectionViewHolder import org.mozilla.fenix.home.sessioncontrol.viewholders.TopSitePagerViewHolder import org.mozilla.fenix.home.sessioncontrol.viewholders.onboarding.OnboardingAutomaticSignInViewHolder @@ -81,7 +80,6 @@ sealed class AdapterItem(@LayoutRes val viewType: Int) { } object PrivateBrowsingDescription : AdapterItem(PrivateBrowsingDescriptionViewHolder.LAYOUT_ID) - object TorFeedbackSurvey : AdapterItem(TorFeedbackSurveyViewHolder.LAYOUT_ID) object NoCollectionsMessage : AdapterItem(NoCollectionsMessageViewHolder.LAYOUT_ID) object TorBootstrap : AdapterItem(TorBootstrapPagerViewHolder.LAYOUT_ID) @@ -181,10 +179,6 @@ class SessionControlAdapter( view, interactor ) - TorFeedbackSurveyViewHolder.LAYOUT_ID -> TorFeedbackSurveyViewHolder( - view, - interactor - ) TorBootstrapPagerViewHolder.LAYOUT_ID -> TorBootstrapPagerViewHolder( view, components, ===================================== app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt ===================================== @@ -92,11 +92,6 @@ interface SessionControlController { */ fun handlePrivateBrowsingLearnMoreClicked() - /** - * @see [TabSessionInteractor.onTorFeedbackSurveyLaunchClicked] - */ - fun handleTorFeedbackSurveyLaunchClicked() - /** * @see [TopSiteInteractor.onRenameTopSiteClicked] */ @@ -625,12 +620,4 @@ class DefaultSessionControlController( override fun handleTorNetworkSettingsClicked() { openTorNetworkSettings() } - - override fun handleTorFeedbackSurveyLaunchClicked() { - activity.openToBrowserAndLoad( - searchTermOrURL = SupportUtils.TOR_FEEDBACK_SURVEY_URL, - newTab = true, - from = BrowserDirection.FromHome - ) - } } ===================================== app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlInteractor.kt ===================================== @@ -18,12 +18,6 @@ interface TabSessionInteractor { * "Common myths about private browsing" link in private mode. */ fun onPrivateBrowsingLearnMoreClicked() - - /** - * Shows the Feedback Survey web page in a new tab. Called when a user clicks on the - * "Launch the Survey" button. - */ - fun onTorFeedbackSurveyLaunchClicked() } /** @@ -367,8 +361,4 @@ class SessionControlInteractor( override fun onTorBootstrapNetworkSettingsClicked() { controller.handleTorNetworkSettingsClicked() } - - override fun onTorFeedbackSurveyLaunchClicked() { - controller.handleTorFeedbackSurveyLaunchClicked() - } } ===================================== app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt ===================================== @@ -66,7 +66,7 @@ private fun showCollections( } } -private fun privateModeAdapterItems() = listOf(AdapterItem.TorFeedbackSurvey) +private fun privateModeAdapterItems() = listOf(AdapterItem.PrivateBrowsingDescription) private fun bootstrapAdapterItems() = listOf(AdapterItem.TorBootstrap) ===================================== app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TorFeedbackSurveyViewHolder.kt deleted ===================================== @@ -1,34 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -package org.mozilla.fenix.home.sessioncontrol.viewholders - -import android.view.View -import androidx.recyclerview.widget.RecyclerView -import kotlinx.android.synthetic.main.tor_feedback_survey.view.* -import org.mozilla.fenix.R -import org.mozilla.fenix.home.sessioncontrol.TabSessionInteractor - -class TorFeedbackSurveyViewHolder( - view: View, - private val interactor: TabSessionInteractor -) : RecyclerView.ViewHolder(view) { - - init { - // val resources = view.resources - // val appName = resources.getString(R.string.app_name) - // view.private_session_description.text = resources.getString( - // R.string.private_browsing_placeholder_description_2, appName - // ) - with(view.feedback_survey_launch_button) { - setOnClickListener { - interactor.onTorFeedbackSurveyLaunchClicked() - } - } - } - - companion object { - const val LAYOUT_ID = R.layout.tor_feedback_survey - } -} ===================================== app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt ===================================== @@ -37,7 +37,6 @@ object SupportUtils { const val DONATE_URL = "https://donate.torproject.org/" const val TB_MANUAL_URL = "https://tb-manual.torproject.org/mobile-tor" const val TOR_RELEASES = "https://www.torproject.org/releases/" - const val TOR_FEEDBACK_SURVEY_URL = "http://bogdyardcfurxcle.onion/index.php/491436" enum class SumoTopic(internal val topicStr: String) { FENIX_MOVING("sync-delist"), ===================================== app/src/main/res/drawable/feedback_survey_padded_background.xml deleted ===================================== @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<ripple xmlns:android="http://schemas.android.com/apk/res/android" - android:color="@color/feedback_survey_padded_background_color"> - <item - android:bottom="6dp" - android:top="6dp"> - <shape android:shape="rectangle"> - <corners android:radius="4dp" /> - </shape> - </item> -</ripple> ===================================== app/src/main/res/drawable/tor_survey_icon_3x.png deleted ===================================== Binary files a/app/src/main/res/drawable/tor_survey_icon_3x.png and /dev/null differ ===================================== app/src/main/res/layout/fragment_home.xml ===================================== @@ -94,8 +94,7 @@ android:textColor="#DEFFFFFF" android:textSize="40sp" android:lineSpacingMultiplier="1.1" - app:layout_scrollFlags="scroll" - android:visibility="gone" /> + app:layout_scrollFlags="scroll" /> </com.google.android.material.appbar.AppBarLayout> ===================================== app/src/main/res/layout/tor_feedback_survey.xml deleted ===================================== @@ -1,79 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<androidx.constraintlayout.widget.ConstraintLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:id="@+id/feedback_survey_wrapper" - style="@style/OnboardingCardLightWithPadding" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:clipChildren="false" - android:clipToPadding="false"> - - <LinearLayout - android:id="@+id/feedback_survey_header_wrapper" - android:layout_width="match_parent" - android:layout_height="wrap_content" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - android:importantForAccessibility="no"> - - <ImageView - android:id="@+id/tor_feedback_icon" - android:layout_width="wrap_content" - android:layout_height="32dp" - android:layout_marginEnd="10dp" - android:adjustViewBounds="true" - android:clickable="false" - android:focusable="false" - android:importantForAccessibility="no" - app:srcCompat="@drawable/tor_survey_icon_3x"/> - - <TextView - android:id="@+id/feedback_survey_header" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:ellipsize="none" - android:lineSpacingExtra="6dp" - android:paddingHorizontal="4dp" - android:paddingTop="4dp" - android:scrollHorizontally="false" - android:textAlignment="viewStart" - android:textColor="?primaryText" - android:textSize="20sp" - android:text="Do you use Snowflake?" /> - </LinearLayout> - - <TextView - android:id="@+id/feedback_survey_description" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:ellipsize="none" - android:lineSpacingExtra="6dp" - android:paddingHorizontal="4dp" - android:paddingTop="4dp" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/feedback_survey_header_wrapper" - android:scrollHorizontally="false" - android:textAlignment="viewStart" - android:textColor="?primaryText" - android:textSize="16sp" - android:text="Snowflake is a pluggable transport available in Tor Browser. Help us improve it by completing this short survey about your browsing experience:" /> - - <Button - style="@style/PositiveButton" - android:id="@+id/feedback_survey_launch_button" - android:text="Launch the Survey" - android:layout_marginTop="16dp" - android:textSize="18dp" - android:textColor="@android:color/black" - android:background="@drawable/feedback_survey_padded_background" - android:fontFamily="Roboto-Medium" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/feedback_survey_description" /> - -</androidx.constraintlayout.widget.ConstraintLayout> ===================================== app/src/main/res/values/colors.xml ===================================== @@ -425,7 +425,4 @@  <color name="toolbar_menu_transparent">@android:color/transparent</color> - -  - <color name="feedback_survey_padded_background_color">#A76FFA</color> </resources> View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/0f3335483d3e8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/0f3335483d3e8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser/tor-browser-87.0b4-10.5-1] squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 23 Mar '21

23 Mar '21

commit b99115221e3e88ef60784fa43f4f841f2fe51557 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Mar 22 18:10:07 2021 +0000 squash! TB4: Tor Browser's Firefox preference overrides. Bug 40383: Disable dom.enable_event_timing --- browser/app/profile/000-tor-browser.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 885a3fe4867b..76ee3a4aa1e1 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -187,6 +187,8 @@ pref("privacy.resistFingerprinting.letterboxing", true); pref("dom.netinfo.enabled", false); pref("network.http.referer.defaultPolicy", 2); // Bug 32948: Make referer behavior consistent regardless of private browing mode status pref("media.videocontrols.picture-in-picture.enabled", false); // Bug 40148: disable until audited in #40147 +// Bug 40383: Disable new PerformanceEventTiming +pref("dom.enable_event_timing", false); // Third party stuff pref("privacy.firstparty.isolate", true); // Always enforce first party isolation

1 0

[tor-browser-build/master] fixup! Release preparations for 10.5a13
by gk＠torproject.org 23 Mar '21

23 Mar '21

commit 8412762adabe8f723b166ebfc50be4347ed8e3f1 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 23 05:50:36 2021 +0000 fixup! Release preparations for 10.5a13 --- projects/firefox-langpacks/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 17a707a..34d6fad 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build2 + ff_build: build1 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' targets:

1 0

[tor-browser-build/master] fixup! Release preparations for 10.5a13
by sysrqb＠torproject.org 22 Mar '21

22 Mar '21

commit 023d12f1d530c067e972e1ce2cbbe95dde0a93bb Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Mar 23 03:01:06 2021 +0000 fixup! Release preparations for 10.5a13 --- projects/firefox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/config b/projects/firefox/config index 4b256f9..19d087a 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -45,7 +45,7 @@ targets: branding_directory: 'browser/branding/official' nightly: - git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2' + git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1' tag_gpg_id: 0 var: branding_directory: 'browser/branding/nightly'

1 0

[tor-browser-build/master] Release preparations for 10.5a13
by sysrqb＠torproject.org 22 Mar '21

22 Mar '21

commit 262e4797f4f2c72b1dda503cc7eda7db16ea969d Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Mar 22 21:06:53 2021 +0000 Release preparations for 10.5a13 Versions bump and Changelog update --- projects/firefox/config | 4 ++-- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 60e979d..4b256f9 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,14 +1,14 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 78.8.0 + firefox_platform_version: 78.9.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 10.5 branding_directory: 'browser/branding/alpha' diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 09da658..02a2905 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,19 @@ +Tor Browser 10.5a13 -- March 24 2021 + * Windows + OS X + Linux + * Update Firefox to 78.9.0esr + * Update NoScript to 11.2.3 + * Update Tor to 0.4.6.1-alpha + * Translations update + * Bug 40030: DuckDuckGo redirect to html doesn't work [torbutton] + * Bug 40032: Remove Snowflake survey banner from TB-alpha [torbutton] + * Build System + * Windows + OS X + Linux + * Update Go to 1.15.10 + * Bug 23631: Use rootless containers [tor-browser-build] + * Bug 40016: getfpaths is not setting origin_project [rbm] + * Windows + * Bug 40252: Bump mingw-w64 and clang for Firefox 78.9 [tor-browser-build] + Tor Browser 10.5a12 -- March 20 2021 * Android * Update Fenix to 87.0.0-beta.2

1 0

[tor-browser-build/maint-10.0-desktop] Pick up build2
by sysrqb＠torproject.org 22 Mar '21

22 Mar '21

commit dc0f81588f1a691124f9c5b4ec029aa5e7596d95 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Mar 23 00:29:51 2021 +0000 Pick up build2 --- projects/firefox/config | 2 +- rbm.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 0830aa0..58ed9f4 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index e0e2c7b..18d0e9e 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '10.0.14' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 10.0.12 - 10.0.13

1 0