[or-cvs] r21756: {projects} merge some branches (projects/todo)

[Nick Mathewson]

Author: nickm
Date: 2010-02-25 19:42:12 +0000 (Thu, 25 Feb 2010)
New Revision: 21756

Modified:
   projects/todo/git-branches
Log:
merge some branches

Modified: projects/todo/git-branches
===================================================================
--- projects/todo/git-branches	2010-02-25 11:34:24 UTC (rev 21755)
+++ projects/todo/git-branches	2010-02-25 19:42:12 UTC (rev 21756)
@@ -1,14 +1,5 @@
 Active branches that the author thinks are ready for merge:
 
-- Update the exit notice to fix some dead links and make it xhtml compliant
-  sebastian/exitnotice
-
-- Update polipo build instructions
-  sebastian/polipo
-
-- Cap PerConnBWRate|Burst at INT32_MAX, update the manpage
-  sebastian/manpage
-
 - Fix bug 1256
   sebastian/bug1256