]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2af6aad 8e8a34e)
Merge commit 'karsten/rendspec-koryk'
authorNick Mathewson <nickm@torproject.org>
Wed, 25 Aug 2010 20:44:37 +0000 (16:44 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 25 Aug 2010 20:44:37 +0000 (16:44 -0400)
1  2 
doc/spec/rend-spec.txt patch | diff1 | diff2 | blob | history

diff --cc doc/spec/rend-spec.txt
Simple merge
Mirror of https://git.torproject.org/tor.git