[tor-commits] [tor/master] Merge remote-tracking branch 'fristonio/ticket-25645'

[nickm at torproject.org]

commit 218b1746baea65c06551f7e2736d382e6a01a49d
Merge: 21c81348a 2680a8b5b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 3 19:19:02 2018 -0400

    Merge remote-tracking branch 'fristonio/ticket-25645'

 changes/ticket25645 | 4 ++++
 src/or/channel.c    | 4 +---
 2 files changed, 5 insertions(+), 3 deletions(-)