[tor-commits] [tor/master] Merge branch 'ticket40042_squashed'

[nickm at torproject.org]

commit 2225c3c36942e09594333758c7ce7d463d988f0e
Merge: 5f969681a0 11f125ec78
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jul 17 11:44:27 2020 -0400

    Merge branch 'ticket40042_squashed'

 changes/ticket33898            |  7 +++++
 src/core/mainloop/connection.c | 32 +++++++-------------
 src/core/or/channel.c          |  3 ++
 src/core/or/channeltls.c       | 33 +++++++++++++--------
 src/core/or/connection_or.c    | 67 +++++++++++++++++-------------------------
 src/core/or/connection_st.h    |  9 ++----
 src/core/or/dos.c              | 12 ++++----
 src/core/or/or_connection_st.h | 17 ++++++-----
 src/lib/net/address.c          | 12 ++++++++
 src/lib/net/address.h          |  1 +
 src/test/test_channel.c        |  4 +--
 src/test/test_channeltls.c     |  2 +-
 src/test/test_connection.c     | 18 +++++++-----
 src/test/test_dos.c            | 30 +++++++++++--------
 14 files changed, 128 insertions(+), 119 deletions(-)