[tor-commits] [tor/master] Merge branch 'tor-gitlab/mr/292_squashed' into maint-0.4.4