Merge commit 'debian-tor-0.2.1.17-rc-1' into maint-0.2.1