[tor-commits] [tor/master] Fix #18012 harder.