commit 9f144144e383169ba6a0de78fde50c0d1f662116 Merge: cfa9ee5 ab9874d Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 1 10:45:34 2011 -0400

Merge branch 'bug3888'

changes/bug3888 | 4 ++++ src/or/connection.c | 1 + 2 files changed, 5 insertions(+), 0 deletions(-)