[tor-commits] [spec/master] Fix issues identified by @bassosimone