[tor-commits] [sbws/master] Combine Fixed sections in Unreleased