[tor-commits] [tor/main] Merge remote-tracking branch 'tor-gitlab/mr/486' into maint-0.3.5