Merge commit 'tor-0.2.1.20' into debian-merge