[tor-commits] [collector/release] Make DescriptorBuilder also accept DescriptorBuilders.