]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge commit 'debian-tor-0.2.2.6-alpha-1'
authorRoger Dingledine <arma@torproject.org>
Mon, 23 Nov 2009 19:29:43 +0000 (14:29 -0500)
committerRoger Dingledine <arma@torproject.org>
Mon, 23 Nov 2009 19:29:43 +0000 (14:29 -0500)

Trivial merge