commit 34552740b18b14d60ce5f6b67c77be13ca94bf14 Author: Nick Mathewson nickm@torproject.org Date: Fri May 16 09:13:38 2014 -0400

Document that we're incrementing version numbers in maint.

(ticket 9553) --- doc/HACKING | 4 ++++ 1 file changed, 4 insertions(+)

diff --git a/doc/HACKING b/doc/HACKING index 2156f7c..028ba2d 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -537,3 +537,7 @@ 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. +