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

[nickm at torproject.org]

commit 938dd5c2677ee378c1423ebdae076aabe8155c1e
Merge: c483d86 84139cb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 17 20:31:45 2011 -0400

    Merge remote-tracking branch 'asn/send_socks_fail_replies'

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