[tor-commits] [tor/release-0.4.6] Merge remote-tracking branch 'tor-gitlab/mr/295' into release-0.4.5