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

[nickm at torproject.org]

commit 169fb1c7d3f40b90538307be920b01c42540ae9d
Merge: 70cb7af b4cb428
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Oct 7 16:17:19 2011 -0400

    Merge remote-tracking branch 'asn/bug3437_v2'

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