[tor-commits] [donate-static/staging] Merge remote-tracking branch 'gitlab/patch-2' into staging