Imported Upstream version 5.3.4

1 files changed, 17 insertions, 0 deletions

diff --git a/conf/strongswan.conf.5.main b/conf/strongswan.conf.5.main
index 559efcb4c..7fc421c60 100644
--- a/conf/strongswan.conf.5.main
+++ b/conf/strongswan.conf.5.main
@@ -102,6 +102,11 @@ Use ANSI X9.42 DH exponent size or optimum size matched to cryptographic
 strength.
 
 .TP
+.BR charon.dlopen_use_rtld_now " [no]"
+Use RTLD_NOW with dlopen when loading plugins and IMV/IMCs to reveal missing
+symbols immediately.
+
+.TP
 .BR charon.dns1 " []"
 DNS server assigned to peer via configuration payload (CP).
 
@@ -152,6 +157,13 @@ Prefix each log entry with the connection name and a unique numerical identifier
 for each IKE_SA.
 
 .TP
+.BR charon.filelog.<filename>.time_add_ms " [no]"
+Adds the milliseconds within the current second after the timestamp (separated
+by a dot, so
+.RI "" "time_format" ""
+should end with %S or %T).
+
+.TP
 .BR charon.filelog.<filename>.time_format " []"
 Prefix each log entry with a timestamp. The option accepts a format string as
 passed to
@@ -344,6 +356,11 @@ reauthentication, but requires support for overlapping SAs by the peer.
 strongSwan can handle such overlapping SAs since version 5.3.0.
 
 .TP
+.BR charon.max_ikev1_exchanges " [3]"
+Maximum number of IKEv1 phase 2 exchanges per IKE_SA to keep state about and
+track concurrently.
+
+.TP
 .BR charon.max_packet " [10000]"
 Maximum packet size accepted by charon.