diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-06-11 10:22:37 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-06-11 10:22:37 -0400 |
| commit | 4313f1cce8b714b112cce16de8b643a6bf61ae7c (patch) | |
| tree | d7e412f41f98beac615e83ed9603326a5a213090 /doc/HACKING/ReleasingTor.md | |
| parent | 3405a311dacae2fa3391333f862fb853a84fc674 (diff) | |
| parent | d41427b054e981152659754ef2b1ee44bb76d722 (diff) | |
| download | tor-4313f1cce8b714b112cce16de8b643a6bf61ae7c.tar.gz tor-4313f1cce8b714b112cce16de8b643a6bf61ae7c.zip | |
Merge branch 'ticket28453_v2' into ticket28453_v2_merged
Diffstat (limited to 'doc/HACKING/ReleasingTor.md')
| -rw-r--r-- | doc/HACKING/ReleasingTor.md | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/doc/HACKING/ReleasingTor.md b/doc/HACKING/ReleasingTor.md index a97ca08ce9..15c8ac55d8 100644 --- a/doc/HACKING/ReleasingTor.md +++ b/doc/HACKING/ReleasingTor.md @@ -247,9 +247,11 @@ new Tor release: `maint-x.y.z` branch to "newversion-dev", and do a `merge -s ours` merge to avoid taking that change into master. -2. Forward-port the ChangeLog (and ReleaseNotes if appropriate) to the - master branch. - -3. Keep an eye on the blog post, to moderate comments and answer questions. +2. If there is a new `maint-x.y.z` branch, create a Travis CI cron job that + builds the release every week. (It's ok to skip the weekly build if the + branch was updated in the last 24 hours.) +3. Forward-port the ChangeLog (and ReleaseNotes if appropriate) to the + master branch. +4. Keep an eye on the blog post, to moderate comments and answer questions. |