]> git.ipfire.org Git - thirdparty/openvpn.git/commit
projects / thirdparty / openvpn.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 793e2ba b431b7c)
Merge branch 'master' into bugfix2.1
authorDavid Sommerseth <dazo@users.sourceforge.net>
Sun, 16 May 2010 17:35:08 +0000 (19:35 +0200)
committerDavid Sommerseth <dazo@users.sourceforge.net>
Sun, 16 May 2010 17:35:08 +0000 (19:35 +0200)
commit942e05525ac2cbf4a258c7b8f514a058cd00486b
treea0c2ffb02472271b5bf84855c050a1b8fe1ae2b2tree
parent793e2baffbe8b6cc34570046d9329f8abfd68c77commit | diff
parentb431b7c3a5f3d765c776d7d35dd6ac84ead9bc4ccommit | diff
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>
openvpn.8 diff1 | diff2 | blob | history
options.c diff1 | diff2 | blob | history
socket.c diff1 | diff2 | blob | history
syshead.h diff1 | diff2 | blob | history
Mirror of https://github.com/OpenVPN/openvpn.git