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

[D. Hugh Redelmeier]

New commits:
commit e3ce63f7b241f1f597a10293352b6802a831ba41
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Sat Jun 4 03:29:16 2016 -0400

    pluto: straighten out some confusion about attribute names and labeled IPSec