[tor-commits] [arm/release] fix: Minor refactoring for moved/removed resources