Merge branch '4.next'
authorJeremy Harris <jgh146exb@wizmail.org>
Tue, 19 Dec 2017 22:14:18 +0000 (22:14 +0000)
committerJeremy Harris <jgh146exb@wizmail.org>
Tue, 19 Dec 2017 22:14:18 +0000 (22:14 +0000)
commitd4fd1b83a197d73cbac114fe53f3448d8b5c7cc2
tree595ac359ff45f8e9f8b29f6432cb088a17cf7a88
parent3721c5545411010ffbea82fc58b883664d07e865
parentb4ad78623875988d016ff816dc6c9c382be897f9
Merge branch '4.next'
doc/doc-docbook/spec.xfpt
doc/doc-txt/ChangeLog
doc/doc-txt/NewStuff
src/src/receive.c
src/src/tls-openssl.c
test/confs/5860