Merge branch 'maint-0.4.8'

diff --cc src/lib/tls/tortls.c
Simple merge

diff --cc src/lib/tls/tortls.h
Simple merge

diff --cc src/lib/tls/tortls_openssl.c
Simple merge