]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge commit 'sebastian/rend-spec'
authorNick Mathewson <nickm@torproject.org>
Tue, 3 Aug 2010 13:16:24 +0000 (09:16 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 3 Aug 2010 13:16:24 +0000 (09:16 -0400)

Trivial merge