[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug9546_v2' into maint-0.2.4

commit 4107ddd003c6c0f1271ad73a40114350f600dbec Merge: 1ee1c8f cbc53a2 Author: Nick Mathewson nickm@torproject.org Date: Sun Aug 25 00:31:51 2013 -0400

Merge remote-tracking branch 'public/bug9546_v2' into maint-0.2.4

changes/bug9546 | 11 +++++++++++ src/or/channeltls.c | 14 ++++++++++++-- src/or/connection_or.c | 9 ++++++++- src/or/or.h | 3 +++ 4 files changed, 34 insertions(+), 3 deletions(-)