commit 65d8448209633cb5f8f7804c309f537e8ac4b803 Merge: d91bbf3 a47e434 Author: Nick Mathewson nickm@torproject.org Date: Thu Aug 2 15:45:10 2012 -0400

Merge remote-tracking branch 'sysrqb/bug6518'

src/or/connection.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)