[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug4697'

[nickm at torproject.org]

commit 878a684386cd4f7570bbc221fdfccdf005611c34
Merge: 8cdeaed e5e50d8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 22 09:45:26 2011 -0500

    Merge remote-tracking branch 'public/bug4697'

 changes/bug4697     |    5 +++++
 src/or/connection.c |    3 +++
 2 files changed, 8 insertions(+), 0 deletions(-)