commit 18fa53fdf4e2b35ceee54c317e989bdbc31183d5 Merge: 8da10e823 65b05b12a Author: Nick Mathewson nickm@torproject.org Date: Thu Jul 2 10:14:55 2020 -0400

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