[tor-commits] [tpo/staging] Merge remote-tracking branch 'gl/patch-1' into staging