[tor-commits] [tor/master] Merge remote-tracking branch 'karsten/task-22207' into maint-0.3.1