From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 16 May 2014 13:13:38 +0000 (-0400)
Subject: Document that we're incrementing version numbers in maint.
X-Git-Tag: tor-0.2.5.5-alpha~60
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=34552740b18b14d60ce5f6b67c77be13ca94bf14;p=thirdparty%2Ftor.git

Document that we're incrementing version numbers in maint.

(ticket 9553)
---

diff --git a/doc/HACKING b/doc/HACKING
index 2156f7ca13..028ba2de42 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.
+