commit 08bbb6b8d921233e8d4780b4bc544022b91f1087 Merge: c948db425 59dac38eb Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jan 14 13:31:20 2020 -0500 Merge branch 'ticket32892_043_01_squashed' changes/ticket32892 | 3 +++ src/core/or/channel.c | 25 +------------------------ src/core/or/channel.h | 9 +-------- src/core/or/command.c | 20 +------------------- src/core/or/command.h | 1 - src/test/test_channel.c | 27 ++------------------------- 6 files changed, 8 insertions(+), 77 deletions(-)