commit 38003f43503dede563e01e8ddc08be8999b35815 Merge: 466e27f 2bf4263 Author: Nick Mathewson <nickm@torproject.org> Date: Thu May 11 07:25:22 2017 -0400 Merge remote-tracking branch 'argonblue/bug22221' src/test/test_channelpadding.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)