Merge branch 'x-ssl-protocol'
Merge branch 'v4.36+xforwarded-for' into x-ssl-protocol
fix position of xsslprotocol documentation
fix the position of xforwardedfor in the documentation
Update manpage with new xsslprotocol option
Make sure the bit is available in options
Initial support for X-SSL-Protocol:
Merge commit 'v4.36+xforwarded-for'
Apply and adjust http://haproxy.1wt.eu/download/patches/stunnel-4.32-…
Update to upstream version 4.36
Update to upstream version 4.35
Update to upstream version 4.34
Update to upstream version 4.33
import version upstream version 4.32
ignore upstream tarball dir
in the beginning