Fix log_mark_time so it will actually do something.
Will like what it does?
fix whitespace
change uses of XAUTHLELEM to make non-overflow evident
Delete whacky unused macro NAT_TRAVERSAL_METHOD
add libcrypto/README
don't overdefine PrivateKeyKind
- no need for DSS until there is a need.
- let C assign the enum values (but avoid 0)
testing: remove basic-pluto-02 - it no longer tests anything

it was based on an (old) OE policy test
NAT-T: new style uses setsockopt and old (KLIPS-only) uses ioctl

Signed-off-by: Paul Wouters <pwouters@redhat.com>
testing: added (re-added?) pluto-log-sanitize.sed to default sanitizers
testing: updated known good output for basic-pluto-0[13]
- create enums time_t_minute, time_t_hour, time_t_day and use them

- #if 0 around declarations in pluto_constants.h that duplicate ietf_constants.h
  We should figure out which place these belong.

- add comment to point out that check_expiry is not re-entrant

- improve list_public_keys()
Merge branch 'master' of vault.libreswan.org:/srv/src/libreswan
tweak programs/pluto/nat_traversal.c
excise log_mark_time: didn't do anything (due to a bug), so we must not need it.
Merge branch 'master' of vault.libreswan.fi:/srv/src/libreswan
rename time_t_* to secs_per_* (type-agnostic)
Revert "NAT-T: new style uses setsockopt and old (KLIPS-only) uses ioctl"

This reverts commit 076142aa122d3d647cbea59f0682b327cc017c1f.

Conflicts:
	programs/pluto/nat_traversal.c
testing: fix pluto-whack-sanitize.sed for IPCOMP SPI sanitation
testing: updated a few test case outputs
Merge branch 'master' of vault.libreswan.fi:/srv/src/libreswan