commit f6fc062119231a2f5cda1e841a14a3f912595532 Merge: 39b54bf1dd f0204a3c34 Author: David Goulet dgoulet@torproject.org Date: Thu Jul 16 12:55:26 2020 -0400

Merge branch 'tor-gitlab/mr/54'

changes/ticket40046 | 3 ++ src/core/mainloop/connection.c | 24 +++++++++++--- src/core/mainloop/connection.h | 2 ++ src/core/or/channeltls.c | 23 ++++++++++++-- src/core/or/channeltls.h | 4 +++ src/core/or/connection_edge.c | 56 +++++++++++++++++++++++++++++++-- src/core/or/connection_edge.h | 4 +++ src/core/or/connection_or.c | 18 +++++++++-- src/core/or/connection_or.h | 1 + src/core/or/scheduler.c | 2 +- src/core/or/scheduler_kist.c | 2 +- src/feature/control/control.c | 20 ++++++++++-- src/feature/control/control.h | 1 + src/feature/control/control_bootstrap.c | 4 +-- src/feature/dircommon/directory.c | 22 +++++++++++-- src/feature/dircommon/directory.h | 1 + 16 files changed, 168 insertions(+), 19 deletions(-)