Document that we're incrementing version numbers in maint.

(ticket 9553)

diff --git a/doc/HACKING b/doc/HACKING
index 2156f7ca1359f6d4f27654d745cbecaed2eed7db..028ba2de42b123437f163c703a7615409d7d8300 100644 (file)
--- 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.
+