Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Block .onion requests in non-Tor window (uplift to 1.20.x) #8051

Merged
merged 2 commits into from
Feb 24, 2021
Merged

Block .onion requests in non-Tor window (uplift to 1.20.x) #8051

merged 2 commits into from
Feb 24, 2021

Conversation

darkdh
Copy link
Member

@darkdh darkdh commented Feb 23, 2021 •
edited by kjozwiak
Loading

Uplift of #8040 which is also required uplifting #7713
Resolves brave/brave-browser#14261
Resolves brave/brave-browser#13736

Pre-approval checklist:

  • You have tested your change on Nightly.
  • This contains text which needs to be translated.
    • There are more than 7 days before the release.
    • I've notified folks in #l10n on Slack that translations are needed.
  • The PR milestones match the branch they are landing to.

Pre-merge checklist:

  • You have checked CI and the builds, lint, and tests all pass or are not related to your PR.

Post-merge checklist:

  • The associated issue milestone is set to the smallest version that the changes is landed on.

@darkdh
Merge pull request #7713 from brave/auto-tor-redirect-crash
12b3bbb 
Fix infinite OpenInTorWindow looping when auto redirect through navigation throttle.
@darkdh
Merge pull request #8040 from brave/block-onion-request
3b25456 
Block .onion requests in non-Tor window
@darkdh darkdh added this to the 1.20.x - Release #3 milestone Feb 23, 2021
@darkdh darkdh requested a review from a team February 23, 2021 20:57
@darkdh darkdh self-assigned this Feb 23, 2021
kjozwiak
kjozwiak approved these changes Feb 24, 2021
View reviewed changes
Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uplift into 1.20.x approved after deliberating with @brave/uplift-approvers. QA has verified the PR on Nightly as per #8040 (comment) & #7713 (comment).

@kjozwiak kjozwiak merged commit 479f8e9 into 1.20.x Feb 24, 2021
@kjozwiak kjozwiak deleted the pr7713_pr8040_1.20.x branch February 24, 2021 01:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kjozwiak kjozwiak kjozwiak approved these changes

Assignees

@darkdh darkdh

Labels
None yet
Projects
None yet
Milestone
1.20.x - Release #3
Development

Successfully merging this pull request may close these issues.
2 participants
@darkdh @kjozwiak