commit d1bbd84a6d1f5e721badb55755e278f2e4f0bf7b Merge: fc5d960 0ed963e Author: Nick Mathewson nickm@torproject.org Date: Thu May 31 14:37:29 2012 -0400

Merge remote-tracking branch 'linus/bug4873_ln'

changes/bug4873 | 3 +++ src/or/connection_or.c | 26 ++++++++++++++------------ 2 files changed, 17 insertions(+), 12 deletions(-)