commit c7b7cf8e18f23a16eaca0520d90f5044fd646857 Merge: ac8e26a41 d70a793cf Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 21 10:39:10 2017 -0400

Merge branch 'maint-0.3.1'

changes/bug23608 | 4 ++++ src/test/test_channelpadding.c | 43 +++++++++++++++++++++++++++++++++++------- 2 files changed, 40 insertions(+), 7 deletions(-)