This patch tags commits on the original (release/hotfix branch) instead
of tagging the merge commit on the master branch.  This keeps the
history git-describe friendly.  (For related discussions, see #49, #85,