r19142@catbus: nickm | 2008-03-30 14:14:52 -0400
commit7ba878d5184024d15fef52090bddc3fb296a9692
authorNick Mathewson <nickm@torproject.org>
Sun, 30 Mar 2008 18:14:58 +0000 (30 18:14 +0000)
committerNick Mathewson <nickm@torproject.org>
Sun, 30 Mar 2008 18:14:58 +0000 (30 18:14 +0000)
tree6e95f7a827ecd7c70a2dbf1b9fc4ebc41f359134
parent78e902f4dd1517382097ffcea819c9da11108740
 r19142@catbus:  nickm | 2008-03-30 14:14:52 -0400
 Merge proposals 130 and 105 into tor-spec and dir-spec; mark them closed.

svn:r14247
dir-spec.txt
proposals/000-index.txt
proposals/105-handshake-revision.txt
proposals/130-v2-conn-protocol.txt
tor-spec.txt