[Swan-dev] merging doubt

D. Hugh Redelmeier hugh at mimosa.com
Sun Jun 14 08:17:02 EEST 2015

| From: Paul Wouters <paul at nohats.ca>

| odd. and there are no merge conflicts left unresolved??

My fault: I resolved a merge conflict the wrong way.  It turns out
that enc_payload_summary was blown away in the rfc7383 changes but a
little crept back in the merge.

More information about the Swan-dev mailing list