[tor-commits] [tor/master] Merge branch 'bug24119_squashed'

[nickm at torproject.org]

commit 1c7121be544ab5a15d8aed6fe3c9c31026eedc02
Merge: bef461ef1 49a4961da
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 30 08:00:34 2017 -0500

    Merge branch 'bug24119_squashed'

 changes/bug24119       |  4 +++
 src/or/channel.c       | 70 +++++++++++++++++++++++++++++++-------------------
 src/or/connection_or.c | 43 ++++++++++++++++++++++---------
 src/or/connection_or.h |  3 +++
 4 files changed, 82 insertions(+), 38 deletions(-)