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

[5.0 -> main] consolidated security fixes from 3.2.5/4.0.5/5.0.0rc3 to main #1968

Merged
merged 7 commits into from
Dec 7, 2023
Merged

[5.0 -> main] consolidated security fixes from 3.2.5/4.0.5/5.0.0rc3 to main #1968

merged 7 commits into from
Dec 7, 2023

Conversation

spoonincode
Copy link
Member

merges to main #1966 which included #1964 which included #1961

linh2931
linh2931 approved these changes Dec 7, 2023
View reviewed changes
Copy link
Member

@linh2931 linh2931 left a comment

Choose a reason for hiding this comment

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

I was worried about potential merge conflicts due to yesterday's block_header_state and block_state renaming on the main. It is great that turns out not an issue.

@spoonincode spoonincode merged commit 4759a7f into main Dec 7, 2023
@spoonincode spoonincode deleted the dec2023_security_main branch December 7, 2023 18:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@heifner heifner heifner approved these changes

@linh2931 linh2931 linh2931 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@spoonincode @heifner @linh2931