Merge branch dane-tpda into dane
authorJeremy Harris <jgh146exb@wizmail.org>
Wed, 20 Aug 2014 19:34:17 +0000 (20:34 +0100)
committerJeremy Harris <jgh146exb@wizmail.org>
Wed, 20 Aug 2014 19:36:25 +0000 (20:36 +0100)
commit83b2729321db62e758a300e372b2dd74e527d004
tree53f73aee926e53f1c203366b086052e5b0dd90df
parenta1bccd48f3956b50a13a34f5aed4b72c658c61af
Merge branch dane-tpda into dane

Conflicts:
doc/doc-txt/experimental-spec.txt
src/src/deliver.c
src/src/functions.h
src/src/smtp_out.c
src/src/tls-openssl.c
src/src/transports/smtp.c
src/src/verify.c
src/src/deliver.c
src/src/tls-openssl.c
src/src/verify.c
test/confs/5860 [new file with mode: 0644]
test/log/5860 [new file with mode: 0644]
test/scripts/5860-DANE-OpenSSL-TPDA/5860 [new file with mode: 0644]
test/scripts/5860-DANE-OpenSSL-TPDA/REQUIRES [new file with mode: 0644]