]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 86a3b65 1cf6da8)
Merge commit 'karsten/rendspec-master'
authorNick Mathewson <nickm@torproject.org>
Fri, 30 Jul 2010 15:45:22 +0000 (11:45 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 30 Jul 2010 15:45:22 +0000 (11:45 -0400)

Trivial merge
Mirror of https://git.torproject.org/tor.git