#32097: Fix conflicts in mobile onbarding while rebasing to esr68.2.0 ------------------------------------------------+-------------------------- Reporter: gk | Owner: tbb-team Type: defect | Status: new Priority: Very High | Milestone: Component: Applications/Tor Browser | Version: Severity: Major | Resolution: Keywords: TorBrowserTeam201910, tbb-9.0-must | Actual Points: Parent ID: | Points: 0.5 Reviewer: | Sponsor: ------------------------------------------------+--------------------------
Comment (by sysrqb): I pushed `bug32097_00` which is `tor-browser-68.1.0esr-9.0-2-build4` rebased onto `gecko-dev/esr68` (Mozilla's github esr68 branch). Would you prefer this as a fixup! commit? I'm not sure the best way of solving this. For reference, the only conflict is on `Bug 25696 - Implement alpha onboarding for Tor Browser for Android` and the diff with resolved conflicts is: {{{ diff -u <(git show 3b3dbd5478641efe578054300018ec81935d4f2c) <(git show 369ed1ff2eb167eb2555125e73a05d27689c5584) }}} (I don't know why we have minor changes in the strings files.) -- Ticket URL: <https://trac.torproject.org/projects/tor/ticket/32097#comment:1> 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