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

[nickm at torproject.org]

commit e3797338e090795b5b11452dc88d318ab375eb1d
Merge: 2d17ad7 43cb2ba
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jun 10 15:44:06 2011 -0400

    Merge remote-tracking branch 'asn/bug3288'

 doc/HACKING |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 46 insertions(+), 0 deletions(-)