Merge branch 'master' into bugfix2.1

Conflicts:
	openvpn.8
	--http-proxy is enhanced with auth-nct for auth (no-clear-text)

Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>

diff --cc openvpn.8
index f2ad5d0360f8e5772554c00a3beacddc4985077d,12294be806fa2eab2e4aee17dac8c4b0896a99b8..6357b95267986c7a58dd23f00ad1c63937375dc3
--- 1/openvpn.8
--- 2/openvpn.8
+++ b/openvpn.8
@@@ -474,7 -474,7 +474,7 @@@ InternetQueryOption API
  This option exists in OpenVPN 2.1 or higher.
  .\"*********************************************************
  .TP
- .B \-\-http-proxy server port [authfile|'auto'] [auth-method]
 -.B --http-proxy server port [authfile|'auto'|'auto-nct'] [auth-method]
++.B \-\-http-proxy server port [authfile|'auto'|'auto-nct'] [auth-method]
  Connect to remote host through an HTTP proxy at address
  .B server
  and port
@@@ -494,9 -501,15 +501,15 @@@ flag causes OpenVPN to automatically de
  and query stdin or the management interface for
  username/password credentials, if required.  This flag
  exists on OpenVPN 2.1 or higher.
+ 
+ The
+ .B auto-nct
+ flag (no clear-text auth) instructs OpenVPN to automatically
+ determine the authentication method, but to reject weak
+ authentication protocols such as HTTP Basic Authentication.
  .\"*********************************************************
  .TP
 -.B --http-proxy-retry
 +.B \-\-http-proxy-retry
  Retry indefinitely on HTTP proxy errors.  If an HTTP proxy error
  occurs, simulate a SIGUSR1 reset.
  .\"*********************************************************

diff --cc options.c
Simple merge

diff --cc socket.c
Simple merge

diff --cc syshead.h
Simple merge