Merge commit 'debian-tor-0.2.2.4-alpha-1'
commitc97a4878af5267a06db4b45a4ed1f70dda7106f2
authorRoger Dingledine <arma@torproject.org>
Mon, 26 Oct 2009 03:59:50 +0000 (25 23:59 -0400)
committerRoger Dingledine <arma@torproject.org>
Mon, 26 Oct 2009 03:59:50 +0000 (25 23:59 -0400)
treef1d94fdaa9c6544c16836a93bcf801b48c3db311
parentafc76a4e714a192e76281793f39c412c87964e46
parent1b2b8ef88188d89e74f0ec3c6b77f2cb4d1dfc18
Merge commit 'debian-tor-0.2.2.4-alpha-1'