diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-12-11 09:44:57 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-12-11 09:44:57 -0500 |
| commit | b915b6cd2171dd9b810bd318739e191db1a810b5 (patch) | |
| tree | 1d16bc690925b233a9b421323a449392f08e59c6 /doc/HACKING | |
| parent | 27e42699296c1a024db294a77ebb1c0c0bbbd179 (diff) | |
| parent | 7da06e43da96f4253a756af546f27f03141b3784 (diff) | |
| download | tor-b915b6cd2171dd9b810bd318739e191db1a810b5.tar.gz tor-b915b6cd2171dd9b810bd318739e191db1a810b5.zip | |
Merge remote-tracking branch 'github/prop297'
Diffstat (limited to 'doc/HACKING')
| -rw-r--r-- | doc/HACKING/ReleasingTor.md | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/doc/HACKING/ReleasingTor.md b/doc/HACKING/ReleasingTor.md index 3073cfb108..7334b1b34a 100644 --- a/doc/HACKING/ReleasingTor.md +++ b/doc/HACKING/ReleasingTor.md @@ -135,13 +135,9 @@ new Tor release: === III. Making the source release. 1. In `maint-0.?.x`, bump the version number in `configure.ac` and run - `perl scripts/maint/updateVersions.pl` to update version numbers in other + `make update-versions` to update version numbers in other places, and commit. Then merge `maint-0.?.x` into `release-0.?.x`. - (NOTE: To bump the version number, edit `configure.ac`, and then run - either `make`, or `perl scripts/maint/updateVersions.pl`, depending on - your version.) - When you merge the maint branch forward to the next maint branch, or into master, merge it with "-s ours" to avoid a needless version bump. |