Merge commit 'karsten/no-time-maint-0.2.1'
commit7d838971dd2dd754cc49ac68f8958529680a569d
authorRoger Dingledine <arma@torproject.org>
Thu, 17 Sep 2009 00:45:01 +0000 (16 20:45 -0400)
committerRoger Dingledine <arma@torproject.org>
Thu, 17 Sep 2009 00:45:01 +0000 (16 20:45 -0400)
treeb535b8b43eeefbc34e55948e99e9b57ffe25a7f6
parent9eb5edc0935939cc5aae2b382a9cfa324a476ef5
parent995606a7e199c1e4cef42b5ba9198c0d891773af
Merge commit 'karsten/no-time-maint-0.2.1'
src/or/rendservice.c