Merge branch 'feat_misc' into beta2.2

Conflicts:
	Makefile.am
	openvpn.8
	options.c
	socket.c
	ssl.c
	- feat_misc is missing a lot of bugfix2.1 changes

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

1 files changed, 1 insertions, 0 deletions

diff --git a/options.h b/options.h
index cb29d79..c51a10d 100644
--- a/options.h
+++ b/options.h
@@ -95,6 +95,7 @@ struct connection_entry
 #ifdef ENABLE_SOCKS
   const char *socks_proxy_server;
   int socks_proxy_port;
+  const char *socks_proxy_authfile;
   bool socks_proxy_retry;
 #endif