Skip to content

[beta] backports #84603

New issue

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

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

Already on GitHub? # to your account

Merged
merged 4 commits into from
Apr 27, 2021
Merged

[beta] backports #84603

merged 4 commits into from
Apr 27, 2021

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Apr 26, 2021

This backports two beta-accepted PRs, fixing CVE-2020-36323 and CVE-2021-31162.

Qwaz and others added 4 commits April 26, 2021 16:46
@rust-highfive
Copy link
Contributor

r? @m-ou-se

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link
Contributor

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 26, 2021
@m-ou-se
Copy link
Member

m-ou-se commented Apr 27, 2021

r? @Mark-Simulacrum

@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=never

@bors
Copy link
Collaborator

bors commented Apr 27, 2021

📌 Commit 836fef0 has been approved by Mark-Simulacrum

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 27, 2021
@bors
Copy link
Collaborator

bors commented Apr 27, 2021

⌛ Testing commit 836fef0 with merge f97769a...

@bors
Copy link
Collaborator

bors commented Apr 27, 2021

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing f97769a to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 27, 2021
@bors bors merged commit f97769a into rust-lang:beta Apr 27, 2021
@rustbot rustbot added this to the 1.52.0 milestone Apr 27, 2021
@cuviper cuviper deleted the beta-next branch May 11, 2021 03:56
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants