[tor-commits] [tor/master] Merge remote-tracking branch 'sebastian/bug4469'

[nickm at torproject.org]

commit 26fcb4bb8c9d3f994a678b641db7b1c91fad8346
Merge: 3ef40f6 4b8d2ad
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 15 11:59:37 2011 -0500

    Merge remote-tracking branch 'sebastian/bug4469'

 changes/bug4469     |    4 ++++
 src/common/util.c   |    2 ++
 src/or/connection.c |    2 ++
 3 files changed, 8 insertions(+), 0 deletions(-)