Merge branch '19667-restrict-pbkdf-memory' into 'stable'
commit4acac7322d22ce5ddade85a6364a832083efa2eb
authorboyska <boyska@riseup.net>
Thu, 1 Jun 2023 09:15:23 +0000 (1 09:15 +0000)
committerboyska <boyska@riseup.net>
Thu, 1 Jun 2023 09:15:23 +0000 (1 09:15 +0000)
treeb36e39671c1dac84d5410b347fe202c74f9086f3
parent4f64e7554348944c98834f442d15278d0ca7a10b
parentd8ecbfb5e150ce78dcddc6c46fa764b7a3f8172a
Merge branch '19667-restrict-pbkdf-memory' into 'stable'

tps: Avoid triggering OOM killer

Closes #19667

See merge request tails/tails!1144
features/step_definitions/common_steps.rb