Merge commit 'karsten/log-1092'
commit8c34e792630fa32a3f472d875e25e6f25078d7e0
authorRoger Dingledine <arma@torproject.org>
Tue, 27 Oct 2009 06:26:58 +0000 (27 02:26 -0400)
committerRoger Dingledine <arma@torproject.org>
Tue, 27 Oct 2009 06:26:58 +0000 (27 02:26 -0400)
tree7a816f6ed93b25ae14d775bdeaed14fdb4e7d6f9
parent19ddee5582bf6dc3d53cb31944de23277341eab6
parentc8b27a8e9eed58ea1a8e8be36289b474f4942c11
Merge commit 'karsten/log-1092'