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