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>

diff --cc init.c
Simple merge

diff --cc options.c
Simple merge

diff --cc options.h
index cb29d797d4a7c7cb0e6595d3f6256ddfec57d200,9a331d810e152b921f51fe5e00227feeececd320..c51a10dfc5edaf2bf1f30d44e7e3d7d9520594af
--- 1/options.h
--- 2/options.h
+++ b/options.h
@@@ -95,16 -95,9 +95,17 @@@ struct connection_entr
  #ifdef ENABLE_SOCKS
    const char *socks_proxy_server;
    int socks_proxy_port;
+   const char *socks_proxy_authfile;
    bool socks_proxy_retry;
  #endif
 +
 +# define CE_DISABLED (1<<0)
 +#if HTTP_PROXY_FALLBACK
 +# define CE_HTTP_PROXY_FALLBACK (1<<1)
 +  time_t ce_http_proxy_fallback_timestamp; /* time when fallback http_proxy_options was last updated */
 +#endif
 +
 +  unsigned int flags;
  };
  
  struct remote_entry

diff --cc route.c
Simple merge

diff --cc socks.c
Simple merge

diff --cc socks.h
Simple merge

diff --cc tun.c
Simple merge