* commit '8b09d917':
  tls: Add options for verifying the peer certificate

Conflicts:
	doc/protocols.texi
	libavformat/tls.c
	libavformat/version.h

See: b2460858
See: 973a758fMerged-by: Michael Niedermayer <michaelni@gmx.at>