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

[D. Hugh Redelmeier]

New commits:
commit 157af04c882710935c4282dc7d8b78a0895203c8
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Fri Jul 13 15:16:45 2018 -0400

    pluto: fix ikev2_need_esp_or_ah_proposals broken in d23fb67075a07e6a7a2a1b4c09589c60534431e8