[Swan-commit] Changes to ref refs/heads/master

[D. Hugh Redelmeier]

New commits:
commit 36b3da661deed0a02ec20b4f56b6d367f0d48ab9
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sun Aug 3 15:43:13 2014 -0400

    Improve ikev2_parse_parent_sa_body and ikev2_parse_child_sa_body
    - reject responder SA with multiple proposals
    - enforce proposal numbering rules
    - eliminate vestigial support for conjunction of proposals (not in RFC)
    - parse proposals after the winner
    - simplify and clarify
    - to do: deduplicate ikev2_parse_parent_sa_body and ikev2_parse_child_sa_body