[tor-commits] [torspec/master] Merge remote-tracking branch 'public/merge_v3'

[nickm@xxxxxxxxxxxxxx]

commit cc64daa3bc90ca875c06b9c68d140cebd6c9be3f
Merge: 40b32dd 6630c95
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Oct 25 20:05:01 2011 -0400

    Merge remote-tracking branch 'public/merge_v3'

 proposals/176-revising-handshake.txt |    2 +-
 proposals/184-v3-link-protocol.txt   |    2 +-
 tor-spec.txt                         |  294 +++++++++++++++++++++++++++++-----
 3 files changed, 256 insertions(+), 42 deletions(-)



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