[tor-commits] [collector/release] Use DescriptorBuilder more often.