Merge commit 'debian-tor-0.2.2.6-alpha-1'
commit0faf5c5fd258ddc65282d6025e70c10226148045
authorRoger Dingledine <arma@torproject.org>
Mon, 23 Nov 2009 19:29:43 +0000 (23 14:29 -0500)
committerRoger Dingledine <arma@torproject.org>
Mon, 23 Nov 2009 19:29:43 +0000 (23 14:29 -0500)
tree49e6c5fdc6e82fa0e28db1add87f14247924f6fc
parentcee9a28d1e4e55fb239da38908b7280ffeef1c72
parent0da554dbc594f573c32b26dba53d8ec1ee780429
Merge commit 'debian-tor-0.2.2.6-alpha-1'