commit 8eed82b3d4bc8d15bd4ec7f229717f903dd6d6c7 Merge: dd22ab5 39a0178 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Sep 9 11:04:54 2014 -0400 Merge remote-tracking branch 'andrea/bug12160_025' into maint-0.2.5 changes/bug12160 | 4 +++ src/or/channel.c | 17 +++++++++++++ src/or/channel.h | 1 + src/or/channeltls.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++-- src/or/channeltls.h | 1 + src/or/connection_or.c | 9 +++++++ 6 files changed, 94 insertions(+), 2 deletions(-)