Merge commit 'debian-tor-0.2.2.5-alpha-1'
commitdabf4423b8a75345ea52e91731083a174ceb33d7
authorRoger Dingledine <arma@torproject.org>
Sun, 15 Nov 2009 15:36:30 +0000 (15 10:36 -0500)
committerRoger Dingledine <arma@torproject.org>
Sun, 15 Nov 2009 15:36:30 +0000 (15 10:36 -0500)
tree9471829a980b9a780f64f2da1ef443d120bd15e4
parent6f1fe7e941b8f6d62829852059862b00beed5a6e
parent327e4dfe2bd285e3ca800c35c736b64f9fc02cbc
Merge commit 'debian-tor-0.2.2.5-alpha-1'