[tor-commits] [tor/master] Merge branch 'bug18570_027' into maint-0.2.7

[nickm at torproject.org]

commit 0b45cab1477d93e3065ca2d35e87483688f16bf6
Merge: 1218d73 72ebf41
Author: Andrea Shepard <andrea at torproject.org>
Date:   Tue Mar 29 15:01:36 2016 +0000

    Merge branch 'bug18570_027' into maint-0.2.7

 changes/bug18570        |   7 +++
 src/or/channel.c        |  38 +++++++++++++--
 src/or/channeltls.c     |  11 +++++
 src/or/connection_or.c  |  35 ++++++++++++++
 src/or/connection_or.h  |   1 +
 src/test/test_channel.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++--
 6 files changed, 204 insertions(+), 9 deletions(-)