[tor-commits] [obfsproxy/master] Merge remote-tracking branch 'nickm/bug5141'

[asn at torproject.org]

commit 5d9ac64d15ca373f2a295dee38bba5691fd53a46
Merge: 29be607 f9d55f0
Author: George Kadianakis <desnacked at riseup.net>
Date:   Tue Apr 17 15:46:27 2012 +0200

    Merge remote-tracking branch 'nickm/bug5141'

 src/util.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)