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

[nickm at torproject.org]

commit d54f1221faf1da44360a14da50096ce47485a963
Merge: c24f24b f3726bd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 16 15:48:03 2012 -0500

    Merge remote-tracking branch 'asn/bug4916'

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