smoother nss:
Many NSS pointers were passed through chunks making to code confusing
and brittle.  No longer.
A side-effect is that this change makes it harder to ditch NSS.
testing: sync from bofh - focus on loopback tests
Merge branch 'master' of ssh://vault.foobar.fi/srv/src/libreswan
slight tidy of programs/pluto/ikev1_quick.c
fix bug in duplicate_state introduced when simplifying NSS use.
testing: remove priority test
testing: ikev2 nat-t tests
ikev2: send and receive nat-t payload
Merge branch 'master' of vault.libreswan.org:/srv/src/libreswan
convert some PR_ASSERT calls to passerts to ease rebasing
Merge branch 'smoother-nss'

Conflicts caused by PR_ASSERT confusion:
	programs/pluto/crypt_dh.c
	programs/pluto/hmac.c
	programs/pluto/ikev1_quick.c
some more merge cleanup
testing: typo in comment
Merge branch 'master' of vault.libreswan.fi:/srv/src/libreswan

Conflicts:
	testing/baseconfigs/all/etc/ipsec.d/ipsec.conf.common
Merge branch 'master' of vault.libreswan.org:/srv/src/libreswan
tidy
- eliminate several compiler warnings by correcting types
- correct some undiagnosed typing errors
- small simplifications
Merge branch 'master' of vault.libreswan.org:/srv/src/libreswan
Tidy handling of pluto_log_file
- don't open pluto_log_file if it is NULL
- add missing newline after diagnostic for failure to open pluto_log_file
- rename pluto_log_fd to pluto_log_fp (it is a FILE *, not a file descriptor)
- protect against use of pluto_log_fp after fclose
- simplify by eliminating log_to_file
- improve modularity of log.c
Remove ub_resolve_free() call on uninitialised value (spotted by clang)
remove some redundant parenthesis (clang warning)