[tor-commits] [donate-static/staging] Merge branch 'yec21' into staging