commit 098cbcbb9ec13861b8c95f6ba5b1581177a1971a Merge: 21ac0cd f1fa85e Author: Nick Mathewson nickm@torproject.org Date: Mon Feb 23 13:03:07 2015 -0500

Merge branch 'bug14989'

changes/bug14989 | 4 ++++ src/or/connection.c | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-)