[tor-commits] [tpo/staging] Merge commit '39e050aeaeb811bd24de210a157bb6b49ad4c6bd' into staging