Merge branch 'maint-0.3.5' into maint-0.4.4

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

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

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

diff --cc src/test/test_tortls_openssl.c
Simple merge