tor-circmgr: Prefer STUB+ where possible.

gabi-250requested to merge
gabi-250/arti:prefer-stub-plus into main

Note: this is stacked on top of !2102 (merged)

Closes #1385 (closed)

Merge request reports