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

[nickm at torproject.org]

commit 80b13f7e1e637390e7cde5695800e6a16f4f08fa
Merge: 337204915 affbe376f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 11 15:53:06 2018 -0400

    Merge branch 'maint-0.3.4' into release-0.3.4

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