commit 14127f226d0e80201e8feac1ce0b8482ae701007 Merge: 26053bd 0cfdd88 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Dec 20 14:40:16 2011 -0500 Merge remote-tracking branch 'asn-mytor/bug4531' src/or/connection_or.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)