Merge branch 'feat_ipv6_transport'

diff --cc buffer.c
Simple merge

diff --cc openvpn.8
Simple merge

diff --cc options.c
Simple merge

diff --cc ps.c
Simple merge

diff --cc win32.h
Simple merge