[tor-commits] [sbws/main] Merge branch 'm12'