Opened 7 months ago

Closed 4 months ago

#32470 closed defect (fixed)

Backport fix for bug 1590538

Reported by: gk Owned by: tbb-team
Priority: Medium Milestone:
Component: Applications/Tor Browser Version:
Severity: Normal Keywords: TorBrowserTeam202001R, GeorgKoppen202001
Cc: pospeselr Actual Points: 0.1
Parent ID: Points: 0.1
Reviewer: mcs Sponsor:

Description

Mozilla landed a fix for our #31764. We should backport their fix and remove our workaround

Child Tickets

Change History (8)

comment:1 Changed 6 months ago by pili

Keywords: TorBrowserTeam201912 added; TorBrowserTeam201911 removed

Moving tickets to December

comment:2 Changed 6 months ago by gk

Keywords: GeorgKoppen201912 added; GeorgKoppen201911 removed

Moving my tickets to December.

comment:3 Changed 5 months ago by sysrqb

Keywords: TorBrowserTeam202001 added; TorBrowserTeam201912 removed

comment:4 Changed 5 months ago by gk

Keywords: GeorgKoppen202001 added; GeorgKoppen201912 removed

No December anymore.

comment:5 Changed 5 months ago by gk

Actual Points: 0.1
Keywords: TorBrowserTeam202001R added; TorBrowserTeam202001 removed
Status: newneeds_review

bug_32470 (https://gitweb.torproject.org/user/gk/tor-browser.git/commit/?h=bug_32470&id=b2f474aa84ee6768f02b9b1fe8b454119383db51) has a cleanly applying backport. I could not test the resulting build yet, though.

comment:6 Changed 4 months ago by pili

Reviewer: mcs

comment:7 Changed 4 months ago by mcs

r=brade, r=mcs

We tested by:

  1. Backing out Richard's original patch for #31764 (commit 59d89229b68f8fbaa46e910a9bd03a6b26e8403e on tor-browser-68.4.1esr-9.5-1).
  2. Building on Linux and then confirming that the original bug did occur.
  3. Applying the patch from comment:5 (backport of Mozilla's fix).
  4. Rebuilding and verifying that the original problem has disappeared again.

We also need to remember to drop Richard's original patch when we merge this one.

comment:8 Changed 4 months ago by boklm

Resolution: fixed
Status: needs_reviewclosed

Thanks. I cherry-picked the patch to tor-browser-68.4.1esr-9.5-1 as commit d361b0b2c8e51cec5088233006be152c340b6553, and reverted the previous fix with commit 45677fd3bc4fd9b69216bb25efadcbac3026672f.

Note: See TracTickets for help on using tickets.