[tor-commits] [torspec/master] Merge branch 'ticket26647_v2'