r19142@catbus: nickm | 2008-03-30 14:14:52 -0400
commit3e992ee419a950b935d480386e2a7723cacc556d
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)
treef05373721d9570d3bbef0cd21f084928e92bf574
parent006530f037d5fdd37301a6e4233ae83c8c86d76e
 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
doc/spec/dir-spec.txt
doc/spec/proposals/000-index.txt
doc/spec/proposals/105-handshake-revision.txt
doc/spec/proposals/130-v2-conn-protocol.txt
doc/spec/tor-spec.txt