Skip to content
Snippets Groups Projects
Commit 7bf80d9d9543 authored by Gregory Szorc's avatar Gregory Szorc
Browse files

merge with stable

There were a handful of merge conflicts in the wire protocol code due
to significant refactoring in default. When resolving the conflicts,
I tried to produce the minimal number of changes to make the incoming
security patches work with the new code.

I will send some follow-up commits to get the security patches better
integrated into default.
No related branches found
No related tags found
No related merge requests found
Showing with 1757 additions and 110 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment