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

[nickm at torproject.org]

commit affbe376f9a15c7c839287b8127d3bd9ac2eab02
Merge: 89c5b8d7d ae1aea4cc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 11 15:53:06 2018 -0400

    Merge branch 'maint-0.3.3' into maint-0.3.4

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