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

[nickm at torproject.org]

commit 1467e33489eca8d12230cdbdf6626ee5037cd86d
Merge: da0fb3e eb5e255
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 19 12:15:03 2011 -0500

    Merge remote-tracking branch 'asn/bug4741'

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