[tor-commits] [obfsproxy/master] Merge remote-tracking branch 'sebastian/bug5097'

commit 01e994abb1a76bcade735fbf5140930cc49ac19c Merge: 9fe5f1c e437115 Author: Nick Mathewson <nickm@torproject.org> Date: Sun Feb 12 23:55:40 2012 -0500 Merge remote-tracking branch 'sebastian/bug5097' src/managed.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)