[or-cvs] r21388: {projects} add bug1196 branch, remove the already-merged oldstuff branc (projects/todo)

[sebastian at seul.org]

Author: sebastian
Date: 2010-01-02 14:59:15 -0500 (Sat, 02 Jan 2010)
New Revision: 21388

Modified:
   projects/todo/git-branches
Log:
add bug1196 branch, remove the already-merged oldstuff branch, and move Jake's AdvertisedPlatform branch to active branches because karsten had concerns

Modified: projects/todo/git-branches
===================================================================
--- projects/todo/git-branches	2010-01-02 18:05:27 UTC (rev 21387)
+++ projects/todo/git-branches	2010-01-02 19:59:15 UTC (rev 21388)
@@ -1,16 +1,16 @@
 Active branches that the author thinks are ready for merge:
 
-- AdvertisedPlatform allows for a custom uname
-  ioerror/AdvertisedPlatform
+- Log at level notice whenever we get a new control connection
+  sebastian/bug1196
 
 - Fix bridge stats
   karsten/fix-bridge-stats-master
 
 Active branches that want more attention before merging:
 
-- Remove a bunch of old code. I'm pretty sure we don't need it anymore,
-  but needs checking.
-  sebastian/oldstuff
+- AdvertisedPlatform allows for a custom uname, problematic for metrics stuff
+  according to karsten.
+  ioerror/AdvertisedPlatform
 
 - Make the ?? country explicitly listable in torrc.  Needs review and
   sanity-testing