Skip to content
Snippets Groups Projects
  • Gregory Szorc's avatar
    7bf80d9d9543
    merge with stable · 7bf80d9d9543
    Gregory Szorc authored
    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.
    7bf80d9d9543
    History
    merge with stable
    Gregory Szorc authored
    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.