[tor-commits] [obfsproxy/master] Merge remote-tracking branch 'asn/bug_error_or_eof'

[nickm at torproject.org]

commit d268a156e54fe8da542c6d3c5c2e4d8bfa05b6ec
Merge: 7123e54 cd64d97
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 17 19:27:32 2011 -0400

    Merge remote-tracking branch 'asn/bug_error_or_eof'

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