[tor-commits] [oonib/master] Add imports and fix referenced-before-assignment