[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.5'

[nickm at torproject.org]

commit 4af88d68b4905beac168adb5f1756d610ff7ed7e
Merge: 619bd43 8eed82b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 9 11:05:28 2014 -0400

    Merge remote-tracking branch 'origin/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(-)