[or-cvs] r21760: {projects} add new commit to branch backports, add note about merging t (projects/todo)

[Sebastian Hahn <tor-svn-commits@xxxxxxxxxxxxxxxxx>]

Author: sebastian
Date: 2010-02-27 01:21:22 +0000 (Sat, 27 Feb 2010)
New Revision: 21760

Modified:
   projects/todo/git-branches
Log:
add new commit to branch backports, add note about merging to master

Modified: projects/todo/git-branches
===================================================================
--- projects/todo/git-branches	2010-02-26 06:19:38 UTC (rev 21759)
+++ projects/todo/git-branches	2010-02-27 01:21:22 UTC (rev 21760)
@@ -1,6 +1,8 @@
 Active branches that the author thinks are ready for merge:
 
-- backport fixes for bug1254, 1255, 1256
+- backport fixes for bug1254, 1255, 1256, 1257. When merging into master,
+  the fix for 1257 needs to come from branch sebastian/bug1257, since master
+  and maint-0.2.1 have diverged here.
   sebastian/backports
 
 - Add new balanced node weights to consensus.