[tor-commits] [arm/master] Use explicit counting to remove dependency on scoping rules.