commit 3de63fe4b13dec4b8bc876e1e402dc0bf3e93fff Merge: 3247518f2 6fc47062a Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 14 07:58:11 2017 -0400

Merge branch 'maint-0.3.1'

changes/bug23077 | 4 +++ src/test/test_channelpadding.c | 56 +++++++++++++++++++++++++++++++++++------- 2 files changed, 51 insertions(+), 9 deletions(-)