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

[nickm at torproject.org]

commit 5bf84b1f00e29a647c1734948d89c15c8a603225
Merge: 7ef22d0bf d70a793cf
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 21 10:39:10 2017 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1

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