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

[nickm at torproject.org]

commit 3747807333093a88c8ae0f6b7a754b803430da63
Merge: 931b2dbae befddf6d2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 12 10:30:54 2017 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug17857               |   6 ++
 src/or/channel.c               |  25 ++++-
 src/or/channelpadding.c        |  34 +++++++
 src/or/channelpadding.h        |   5 +
 src/test/test_channelpadding.c | 201 +++++++++++++++++++++++++++++++++++++----
 5 files changed, 246 insertions(+), 25 deletions(-)