[tor-commits] [torspec/master] Merge branch 'neel/bug28279'