commit d094a76cc8239f9d0e4123d87a0c8531b22cba79 Merge: aa01d0a 9bd811b Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jan 17 09:20:24 2013 -0500 Merge remote-tracking branch 'public/bug6302' src/common/tortls.c | 26 +++++--------------------- src/or/connection.c | 6 +----- 2 files changed, 6 insertions(+), 26 deletions(-)