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