I'd say it depends on following cases:
- If maintaining the
mainbranch, the correct place ishotfix/. - If maintaining the
release/branch, the correct place isbugfix/. - The best case scenario (and if possible) is to maintain refactoring candidates in the
feature/branch right away.
Keep in mind that the options 1. and 2. are real world scenarios and covered by the git flow strategy because of meeting release deadlines or saving costs (or better gaining profit in time or money). So I don't see any troubles in organizing that way since git flow updates main, develop and feature/ branches in order.
Comment: If you have never expirienced case 1 or 2 then feel lucky and share good vibes with others.