diff options
author | David Sommerseth <dazo@users.sourceforge.net> | 2010-11-13 00:55:02 +0100 |
---|---|---|
committer | David Sommerseth <dazo@users.sourceforge.net> | 2010-11-13 00:55:02 +0100 |
commit | 1aa664cef51e4b4ed4b35e569925acb4fd7b9b52 (patch) | |
tree | 616d3705094f7a68ddc7c3929b8a9c0afc20509a /init.c | |
parent | 61c40649de994c8f2ce713389294134aeb6cc8a7 (diff) | |
parent | f0eac1a5979096c671b3674f9d80871f496d1da8 (diff) | |
download | openvpn-1aa664cef51e4b4ed4b35e569925acb4fd7b9b52.tar.gz openvpn-1aa664cef51e4b4ed4b35e569925acb4fd7b9b52.tar.xz openvpn-1aa664cef51e4b4ed4b35e569925acb4fd7b9b52.zip |
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>
Diffstat (limited to 'init.c')
-rw-r--r-- | init.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -417,6 +417,7 @@ init_proxy_dowork (struct context *c) { c->c1.socks_proxy = socks_proxy_new (c->options.ce.socks_proxy_server, c->options.ce.socks_proxy_port, + c->options.ce.socks_proxy_authfile, c->options.ce.socks_proxy_retry, c->options.auto_proxy_info); if (c->c1.socks_proxy) |