diff options
Diffstat (limited to 'doc/HACKING')
| -rw-r--r-- | doc/HACKING | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/HACKING b/doc/HACKING index 2156f7ca1..c69b2a6fe 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -537,3 +537,9 @@ changelog to tor-talk or tor-announce. (We might be moving to faster announcements, but don't announce until the website is at least updated.) +13) If it's a stable release, bump the version number in the maint-x.y.z + branch to "newversion-dev", and do a "merge -s ours" merge to avoid + taking that change into master. Do a similar 'merge -s theirs' + merge to get the change (and only that change) into release. (Some + of the build scripts require that maint merge cleanly into release.) + |