Merge branch 'maint-0.3.5' into maint-0.4.3
commit8a561fc5bfc48b3d849d62b266d323f98d509a50
authorNick Mathewson <nickm@torproject.org>
Wed, 7 Oct 2020 12:05:40 +0000 (7 08:05 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 7 Oct 2020 12:05:40 +0000 (7 08:05 -0400)
treed8e73e20c1f0108c9d1d497e10624ae6cc6ddbaa
parentb5a88e8d478e553eb7c6bc022d47a084d6845e64
parent84a5bd48e2717f29b547d9fd43d83cab3da39aaa
Merge branch 'maint-0.3.5' into maint-0.4.3
src/core/or/channel.c
src/core/or/channel.h
src/core/or/channeltls.c
src/core/or/circuitbuild.c
src/test/test_channel.c