[tor-commits] [torspec/master] Fix issues noted by atagar