[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

[nickm at torproject.org]

commit 06414b992201764e885962d5ed27bcae699745be
Merge: 82a68be 8f59661
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 26 11:39:43 2017 -0400

    Merge branch '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(-)