]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge commit 'debian-tor-0.2.2.5-alpha-1'
authorRoger Dingledine <arma@torproject.org>
Sun, 15 Nov 2009 15:36:30 +0000 (10:36 -0500)
committerRoger Dingledine <arma@torproject.org>
Sun, 15 Nov 2009 15:36:30 +0000 (10:36 -0500)

Trivial merge