[tor-commits] [tor/master] Merge branch 'rust-panic1-034' into rust-panic1-035