[tor-commits] [torspec/master] Merge remote-tracking branches 'atagar/10086' and 'atagar/10085'