Merge branch 'cmd-proposals'
authorMartin Willi <martin@revosec.ch>
Thu, 6 Feb 2014 14:58:41 +0000 (15:58 +0100)
committerMartin Willi <martin@revosec.ch>
Thu, 6 Feb 2014 14:58:41 +0000 (15:58 +0100)
commitfe40c4754767bda0fadb1a83ec9ab6af0125b488
treef83b00cfaccca7795bf5a4bb5cca27e0c5a3cc70
parent0edd13b6c85af9baa2d870e82b796f11c5020857
parente2de972c55c882274a826926aac414ae432740ae
Merge branch 'cmd-proposals'

Introduce --ike/esp/ah-proposal options to offer custom proposals, and requests
an IPv6 virtual IP if an IPv6 --remote-ts is given.

Fixes #508.