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

[nickm at torproject.org]

commit 99e4809b3ada50bd14b46f7eb9b23f4ebaaff35c
Merge: a60c1b4 7efc156
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 18 10:59:56 2012 -0500

    Merge remote-tracking branch 'asn/bug4928'

 src/main.c    |   60 ++++++++++++++++++++++++++------------------------------
 src/managed.c |   28 ++++++++++++++++++++++++++
 src/util.c    |   12 +++++++++++
 src/util.h    |    2 +
 4 files changed, 70 insertions(+), 32 deletions(-)