Merge branch 'bugfix2.1' into beta2.2

diff --cc openvpn.8
Simple merge

diff --cc options.c
index 2c2a782ffd32bff7a1c0f7a8098d38836ba13120,e39a8ba76ad954ac5184e131552a21cc3e89e2ff..d40c7f0eae072771cbaa3055f245e2836926c4e5
--- 1/options.c
--- 2/options.c
+++ b/options.c
@@@ -5750,13 -5725,9 +5767,14 @@@ add_option (struct options *options
        VERIFY_PERMISSION (OPT_P_SCRIPT);
        if (!no_more_than_n_args (msglevel, p, 2, NM_QUOTE_HINT))
        goto err;
+       warn_multiple_script (options->tls_verify, "tls-verify");
        options->tls_verify = string_substitute (p[1], ',', ' ', &options->gc);
      }
 +  else if (streq (p[0], "tls-export-cert") && p[1])
 +    {
 +      VERIFY_PERMISSION (OPT_P_GENERAL);
 +      options->tls_export_cert = p[1];
 +    }
    else if (streq (p[0], "tls-remote") && p[1])
      {
        VERIFY_PERMISSION (OPT_P_GENERAL);