]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge commit 'sebastian/quiet'
authorNick Mathewson <nickm@torproject.org>
Mon, 25 Jan 2010 19:39:20 +0000 (14:39 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 25 Jan 2010 19:39:20 +0000 (14:39 -0500)

Trivial merge