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

[nickm@xxxxxxxxxxxxxx]

commit d589ba698796a44188bfbb5c8768adcf3c32fcf8
Merge: d3afe74 2a65bc2
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Sat Dec 17 13:17:14 2011 -0500

    Merge remote-tracking branch 'asn/bug4558'

 doc/obfsproxy_architecture.txt |  186 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 186 insertions(+), 0 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits