[tor-commits] [tor/maint-0.4.0] Merge branch 'rust-panic1-035' into rust-panic1-040