[tor-commits] [obfsproxy/master] Merge remote-tracking branch 'asn/bug3288'
nickm at torproject.org
nickm at torproject.org
Sat May 28 04:35:14 UTC 2011
commit 8ac51f3f334b4d2116a8ddcea04483dfc5358b26
Merge: 3d988b6 3680735
Author: Nick Mathewson <nickm at torproject.org>
Date: Sat May 28 00:35:42 2011 -0400
Merge remote-tracking branch 'asn/bug3288'
doc/THREAT_MODEL | 19 ++++++++
doc/THREAT_MODEL_PHILOSOPHICAL | 99 ++++++++++++++++++++++++++++++++++++++++
doc/protocol-spec.txt | 41 ++++++++++-------
3 files changed, 142 insertions(+), 17 deletions(-)
More information about the tor-commits
mailing list