[or-cvs] r20870: {projects} remove the already-merged branches from git-branches, add a (projects/todo)

[sebastian at seul.org]

Author: sebastian
Date: 2009-10-27 09:12:48 -0400 (Tue, 27 Oct 2009)
New Revision: 20870

Modified:
   projects/todo/git-branches
Log:
remove the already-merged branches from git-branches, add a new one for coverity stuff

Modified: projects/todo/git-branches
===================================================================
--- projects/todo/git-branches	2009-10-27 04:20:30 UTC (rev 20869)
+++ projects/todo/git-branches	2009-10-27 13:12:48 UTC (rev 20870)
@@ -1,34 +1,17 @@
 Active branches that the author thinks are ready for merge:
 
-o merge http://asteria.noreply.org/~weasel/0001-Ship-test.h-in-release.patch
-
-o merge weasel's debian branch at tag debian-tor-0.2.2.4-alpha-1 into master.
-  repository at git://git.torproject.org/~weasel/git/tor
-
-o Dump unparseable descriptors to disk; helps diagnosing 1051
-  karsten/fix-1051-file2-maint-0.2.1
-  [Merged into master in late August, and not into 0.2.1 I think -RD]
-
-o Don't call time(NULL) more often than needed.
-  karsten/no-time-maint-0.2.1
-  [Merged only to master, since I don't think it hurts 0.2.1 to leave it -RD]
-
-- DisableAllSwap is a new option to attempt mlockall() on supported platforms.
-  ioerror/DisableAllSwap
-
 - AdvertisedPlatform allows for a custom uname
   ioerror/AdvertisedPlatform
 
+- A few coverity-related fixes
+  sebastian/coverity
+
 Active branches that want more attention before merging:
 
 - Make the ?? country explicitly listable in torrc.  Needs review and
   sanity-testing
   nickm/bug1094
 
-o mikeperry's CircuitBuildTimeout branch needs review and someone
-  to comment on the XXX's and advise him how to fix them.
-  mikeperry/circuitbuildtimeout
-
 - Include the git version where the svn revision used to be
   nickm/gitversion
   [Merged to master; candidate for maint-0.2.1]
@@ -48,10 +31,6 @@
   - Better removed .exit support
     nickm/more.exit
 
-o Avoid segfault in rare cases when finishing an intro circuit as a client
-  and finding out that we don't have an intro key for it.
-  karsten/fix-1073 [Merge to maint-0.2.1, don't merge into master for now]
-
 Things to backport/merge to 0.2.1.x for 0.2.1.20 release:
 
 - Let 0.2.1.x controllers hear bandwidth numbers from the consensus.
@@ -79,8 +58,5 @@
 - Updated Linux QoS scripts (still have a couple more changes to go)
   mikeperry/linux-qos
 
-- Nick's work on moving the unit tests to tinytest
-  nickm/tinytest
-
 - Roger's work on improved ExcludeNodes support (bug 1090)
   arma/strictnodes