Merge commit 'karsten/rendspec-koryk'
commit2804c6b7fff6da6eb337117f01847eadab7701c0
authorNick Mathewson <nickm@torproject.org>
Wed, 25 Aug 2010 20:44:37 +0000 (25 16:44 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 25 Aug 2010 20:44:37 +0000 (25 16:44 -0400)
tree1c803c20587f1c6f71ff9bfc4283ff2042e369d8
parent2af6aadfe9a28dd96d3bc4c3741b859492e12a5e
parent8e8a34eb744157ae4076d9b29e5b4d7bbff19512
Merge commit 'karsten/rendspec-koryk'
doc/spec/rend-spec.txt