Skip to content
Snippets Groups Projects

Support moving out of the TorConnectState.Bootsrapped state for gTorConnectTitlebarStatus and gTorConnectUrlbarButton.

Merged Support moving out of the TorConnectState.Bootsrapped state for gTorConnectTitlebarStatus and gTorConnectUrlbarButton.
henry/tor-browser:tor-connect-bootstrapped-to-configuring-bug-42079 into tor-browser-115.2.1esr-13.0-1
Merged henry requested to merge henry/tor-browser:tor-connect-bootstrapped-to-configuring-bug-42079 into tor-browser-115.2.1esr-13.0-1

Merge Info

Related Issues

Backporting

Timeline

  • Immediate: patchset needed as soon as possible
  • Next Minor Stable Release: patchset that needs to be verified in nightly before backport
  • Eventually: patchset that needs to be verified in alpha before backport
  • No Backport (preferred): patchset for the next major stable

(Optional) Justification

  • Emergency security update: patchset fixes CVEs, 0-days, etc
  • Censorship event: patchset enables censorship circumvention
  • Critical bug-fix: patchset fixes a bug in core-functionality
  • Consistency: patchset which would make development easier if it were in both the alpha and release branches; developer tools, build system changes, etc
  • Sponsor required: patchset required for sponsor
  • Other: please explain

Merging

  • Merge to tor-browser - !fixups to tor-browser-specific commits, new features, security backports
  • Merge to base-browser - !fixups to base-browser-specific commits, new features to be shared with mullvad-browser, and security backports
    • NOTE: if your changeset includes patches to both base-browser and tor-browser please clearly label in the change description which commits should be cherry-picked to base-browser after merging

Issue Tracking

Review

Request Reviewer

  • Request review from an applications developer depending on modified system:
    • NOTE: if the MR modifies multiple areas, please /cc all the relevant reviewers (since gitlab only allows 1 reviewer)
    • accessibility : henry
    • android : dan
    • build system : boklm
    • extensions : ma1
    • firefox internals (XUL/JS/XPCOM) : ma1
    • fonts : pierov
    • frontend (implementation) : henry
    • frontend (review) : donuts, richard
    • localization : henry, pierov
    • nightly builds : boklm
    • rebases/release-prep : dan_b, ma1, pierov, richard
    • security : ma1
    • signing : boklm, richard
    • updater : pierov
    • misc/other : pierov, richard

Change Description

Basically, if the tor process exits early and we leave the "Bootstrapped" state (re-entering the "Configuring" state), we re-show the "Connect" button next to the search bar and re-show the connection status ("Not Connected" or "Potentially Blocked") in the title bar.

In response to a change in !721 (merged), but this patch should be safe to land beforehand as well.

/cc @pierov if you want to see if this works with your patch.

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
Please register or sign in to reply