Merge pull request #2790 from yellowred/tokio-ver-bump