commit 8bb23c7def49e5a090d337e56eee8398261d9fb6 Merge: e718397 e27a26d Author: Nick Mathewson nickm@torproject.org Date: Tue Nov 29 19:15:40 2011 -0500

Merge branch 'bug4587_v2'

src/common/tortls.c | 2 -- src/or/connection_or.c | 17 +++++++---------- 2 files changed, 7 insertions(+), 12 deletions(-)