[tor-commits] [tor/master] Merge branch 'maint-0.4.4'

[nickm at torproject.org]

commit 2e98e881178470201ed23ef381b0e9ede4f4f613
Merge: 20d1a1cdb 18fa53fdf
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 2 10:15:04 2020 -0400

    Merge branch 'maint-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(-)