commit befddf6d2a46cd25beeb46357bf6cc4fe21802ce Merge: 469189d84 6689c95d0 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Sep 12 10:29:00 2017 -0400 Merge branch 'ticket17857_squashed' into maint-0.3.1 changes/bug17857 | 6 ++ src/or/channel.c | 25 ++++- src/or/channelpadding.c | 34 +++++++ src/or/channelpadding.h | 5 + src/test/test_channelpadding.c | 201 +++++++++++++++++++++++++++++++++++++---- 5 files changed, 246 insertions(+), 25 deletions(-)