commit f6c96fd0cacfb44b4a97ac2a9887a80920937da1 Merge: 962c2f877 24299d385 Author: Nick Mathewson <nickm@torproject.org> Date: Fri May 11 17:57:59 2018 -0400 Merge remote-tracking branch 'public/bug25994' changes/ticket25994 | 5 +++++ src/test/test_channel.c | 6 ++++++ 2 files changed, 11 insertions(+)