[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm at torproject.org]

commit c61e919ec2211b58f2090e0e0c2ec60804fa2044
Merge: a040b0589 6fc47062a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 14 07:57:18 2017 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1

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