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

[nickm at torproject.org]

commit 1239fcfc37aaf6b732e0733ad747a7b3e56534c4
Merge: 95f06d61d ae1aea4cc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 11 15:53:06 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug25505        | 3 +++
 src/or/channelpadding.c | 9 +++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)