[tor-dev] Proposing sbws changes