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

[nickm at torproject.org]

commit 1f3e0f157cbd7c71f8f8505e3f0ee3cc07ead629
Merge: 08cc2cc69 841ed9dbb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 26 19:47:48 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug24904 | 4 ++++
 src/or/channel.c | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)