Merge branch 'master' into build_NSIS_based_installers_for_32bit_Windows

diff --cc .gitlab-ci.yml
Simple merge

diff --cc configure.ac
index b9ad1abf622e3197eb11c104a391673aec18c287,d1716dfe7235fa4531b63e390f27e7e11ad3290b..74ea785a608ba791d214acf456c1cf8cc49cf84a
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -691,7 -697,7 +697,7 @@@ PKG_CHECK_MODULES(LIBXML2, libxml-2.0
  
  PKG_CHECK_MODULES(ZLIB, zlib, [AC_SUBST(ZLIB_PC, [zlib])],
                  [oldLIBS="$LIBS"
--                LIBS="$LIBS -lz" 
++                LIBS="$LIBS -lz"
                  AC_MSG_CHECKING([for zlib without pkg-config])
                  AC_LINK_IFELSE([AC_LANG_PROGRAM([
                   #include <zlib.h>],[

diff --cc tests/configs/test-obsolete-server-crypto.config
index e1ed797d3ac8961889e2f15d00f22b780caf998a,628e734d40784e8bc352ef6e5ed5ef6b86140d75..1f8ca7a9de42d8591751bebb1e041e9e7411bcd3
--- 1/tests/configs/test-obsolete-server-crypto.config.in
--- 2/tests/configs/test-obsolete-server-crypto.config
+++ b/tests/configs/test-obsolete-server-crypto.config
@@@ -1,8 -1,8 +1,8 @@@
  # User authentication method. Could be set multiple times and in that case
  # all should succeed.
--# Options: certificate, pam. 
++# Options: certificate, pam.
  #auth = "certificate"
- auth = "plain[@abs_top_srcdir@/tests/configs/test1.passwd]"
+ auth = "plain[@SRCDIR@/configs/test1.passwd]"
  #auth = "pam"
  
  # A banner to be displayed on clients
@@@ -17,7 -17,7 +17,7 @@@ use-dbus = n
  #max-clients = 1024
  max-clients = 16
  
--# Limit the number of client connections to one every X milliseconds 
++# Limit the number of client connections to one every X milliseconds
  # (X is the provided value). Set to zero for no limit.
  rate-limit-ms = 0
  
@@@ -42,7 -42,7 +42,7 @@@ dpd = 44
  try-mtu-discovery = false
  
  # The key and the certificates of the server
--# The key may be a file, or any URL supported by GnuTLS (e.g., 
++# The key may be a file, or any URL supported by GnuTLS (e.g.,
  # tpmkey:uuid=xxxxxxx-xxxx-xxxx-xxxx-xxxxxxxx;storage=user
  # or pkcs11:object=my-vpn-key;object-type=private)
  #
@@@ -79,14 -79,14 +79,14 @@@ ca-cert = @SRCDIR@/certs/ca.pe
  
  # The object identifier that will be used to read the user ID in the client certificate.
  # The object identifier should be part of the certificate's DN
--# Useful OIDs are: 
++# Useful OIDs are:
  #  CN = 2.5.4.3, UID = 0.9.2342.19200300.100.1.1
  cert-user-oid = 0.9.2342.19200300.100.1.1
  
--# The object identifier that will be used to read the user group in the client 
++# The object identifier that will be used to read the user group in the client
  # certificate. The object identifier should be part of the certificate's DN
--# Useful OIDs are: 
--#  OU (organizational unit) = 2.5.4.11 
++# Useful OIDs are:
++#  OU (organizational unit) = 2.5.4.11
  #cert-group-oid = 2.5.4.11
  
  # A revocation list of ca-cert is set
@@@ -99,7 -99,7 +99,7 @@@ tls-priorities = "@TLS_PRIORITIES@
  # to authentication
  auth-timeout = 40
  
--# The time (in seconds) that a client is not allowed to reconnect after 
++# The time (in seconds) that a client is not allowed to reconnect after
  # a failed authentication attempt.
  #min-reauth-time = 2
  
@@@ -111,7 -111,7 +111,7 @@@ cookie-validity = 17280
  
  # Script to call when a client connects and obtains an IP
  # Parameters are passed on the environment.
--# REASON, USERNAME, GROUPNAME, HOSTNAME (the hostname selected by client), 
++# REASON, USERNAME, GROUPNAME, HOSTNAME (the hostname selected by client),
  # DEVICE, IP_REAL (the real IP of the client), IP_LOCAL (the local IP
  # in the P-t-P connection), IP_REMOTE (the VPN IP of the client). REASON
  # may be "connect" or "disconnect".
@@@ -151,28 -151,28 +151,28 @@@ ipv4-dns = 192.168.1.
  # The NBNS server (if any)
  #ipv4-nbns = 192.168.2.3
  
--#ipv6-address = 
--#ipv6-mask = 
--#ipv6-dns = 
++#ipv6-address =
++#ipv6-mask =
++#ipv6-dns =
  
  # Prior to leasing any IP from the pool ping it to verify that
  # it is not in use by another (unrelated to this server) host.
  ping-leases = false
  
  # Leave empty to assign the default MTU of the device
--# mtu = 
++# mtu =
  
  route = 192.168.1.0/255.255.255.0
  #route = 192.168.5.0/255.255.255.0
  
  #
--# The following options are for (experimental) AnyConnect client 
--# compatibility. They are only available if the server is built 
++# The following options are for (experimental) AnyConnect client
++# compatibility. They are only available if the server is built
  # with --enable-anyconnect
  #
  
  # Client profile xml. A sample file exists in doc/profile.xml.
--# This file must be accessible from inside the worker's chroot. 
++# This file must be accessible from inside the worker's chroot.
  # The profile is ignored by the openconnect client.
  #user-profile = profile.xml
  
@@@ -181,4 -181,4 +181,3 @@@
  # cookie. Legacy CISCO clients do not do that, and thus this option
  # should be set for them.
  cisco-client-compat = true
--