commit 30e2652216eabd7c5c35748cf6e71de9f69686f1
Merge: df246794f 18fa53fdf
Author: Nick Mathewson <[email protected]>
Date: Thu Jul 2 10:15:04 2020 -0400
Merge branch 'maint-0.4.4' into release-0.4.4
changes/ticket32622 | 5 +++++
src/core/mainloop/connection.c | 1 +
src/core/or/connection_or.c | 18 +++++++++++++-----
src/core/or/or.h | 3 ++-
src/core/or/reasons.c | 4 ++++
src/lib/tls/tortls.h | 1 +
src/lib/tls/tortls_nss.c | 13 +++++++++++++
src/lib/tls/tortls_openssl.c | 20 ++++++++++++++++++++
src/lib/tls/tortls_st.h | 3 +++
9 files changed, 62 insertions(+), 6 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
