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

[nickm at torproject.org]

commit 2bb64a9c80138081557263506adb3ac369da5ee5
Merge: bb905a7 ceedb35
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 14 18:37:57 2012 -0500

    Merge remote-tracking branch 'sebastian/bug5137'

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