When submitting a bugfix patch *initially*

[Mark Geisert]

..to the main branch, which release version file gets the bugfix 
description?  Assuming current branches...
version/3.6.0 because the patch is initially going to master, or
version/3.5.5 on the main branch because bugfixes get backported?
If version/3.6.0 initially, then when the bugfix gets backported does the 
bugfix description move from version/3.6.0 to version/3.5.5 or does it 
exist in both version files?
Thanks much,

..mark