#29104: Rebase Tor Browser patches against 60.5.0esr -------------------------------------------------+------------------------- Reporter: gk | Owner: tbb- | team Type: task | Status: closed Priority: Very High | Milestone: Component: Applications/Tor Browser | Version: Severity: Normal | Resolution: fixed Keywords: TorBrowserTeam201901R, | Actual Points: GeorgKoppen201901 | Parent ID: | Points: Reviewer: | Sponsor: -------------------------------------------------+------------------------- Changes (by gk):
* status: needs_review => closed * resolution: => fixed Comment: Replying to [comment:4 mcs]: > r=brade, r=mcs > Everything looks good to us. As a double-check against the work of the automated reformatting tools, we quickly compared each of the rebased patches against each of the `tor-browser-60.4.0esr-8.0-1` patches. The only thing we noticed that was a little surprising was that for some patches reformatting was done that was unrelated to the original patch, e.g., note the whitespace changes in the second of these two patches: > * 432f8e57e03a3be2d4e5932eb61a6b3b88168d14 (60.4.0esr patch for #18900) > * b81a07a586f7a2312645d35fd5a08b94fda919f5 (60.5.0esr patch for #18900) > Presumably slightly different `clang-format` rules were used. It looks like the format in the rebased patches matches that used on `mozilla- central` so it seems fine. Yeah, I think the whitespace changes are okay. I took the rebased 8.0 branch for 8.0.5 build1 and will use the 8.5 one as a baseline for the final branch for the alpha. I think we are done here, thanks! -- Ticket URL: <https://trac.torproject.org/projects/tor/ticket/29104#comment:5> Tor Bug Tracker & Wiki <https://trac.torproject.org/> The Tor Project: anonymity online
_______________________________________________ tor-bugs mailing list tor-bugs@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs