commit 8f59661dbaa25b54a9fad8a8dc5322a7778a7fc7 Merge: 0c7c494 0c4751b Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 26 11:27:09 2017 -0400

Merge branch 'bug22212_squashed' into maint-0.3.1

changes/bug22212 | 5 +++++ src/or/channelpadding.c | 16 +++++++++++++--- src/test/test_channelpadding.c | 2 -- 3 files changed, 18 insertions(+), 5 deletions(-)