[tor-commits] [torspec/master] Merge branch 'rend-ng-descriptors_squashed'