Merge commit 'tor-0.2.1.19' into debian-merge