Merge commit 'sebastian/quiet'
commit2d3f21e9ee5d173640b83b21913da692e74ede10
authorNick Mathewson <nickm@torproject.org>
Mon, 25 Jan 2010 19:39:20 +0000 (25 14:39 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 25 Jan 2010 19:39:20 +0000 (25 14:39 -0500)
tree0dcd67dcfe099403a5cc3cc7f7a1377014b8babd
parentdf3812ede144d7bc8dd15f84497b09f39c850157
parent7e89cc31ab16ea56a6ef45c16910c9adfe7a9d7a
Merge commit 'sebastian/quiet'