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

[Tuomo Soini]

New commits:
commit 4cc01e628a21da708ac1d838b54405b874b970e3
Author: Tuomo Soini <tis at foobar.fi>
Date:   Tue Dec 13 23:22:41 2016 +0200

    nss: really separate nssdir and confdir, rename nssdb to nssdir
    
    Replace nssdb with nssdir to be consistent with command line arguments.
    Remove nss_init_ipsecdir which initialized both nssdir and confdir. These
    are now separate so they shouldn't be initialized same.
    
    Signed-off-by: Tuomo Soini <tis at foobar.fi>