[or-cvs] r21287: {projects} clean up the git-branches file and add a new branch (projects/todo)

[sebastian at seul.org]

Author: sebastian
Date: 2009-12-20 01:13:38 -0500 (Sun, 20 Dec 2009)
New Revision: 21287

Modified:
   projects/todo/git-branches
Log:
clean up the git-branches file and add a new branch

Modified: projects/todo/git-branches
===================================================================
--- projects/todo/git-branches	2009-12-20 05:28:45 UTC (rev 21286)
+++ projects/todo/git-branches	2009-12-20 06:13:38 UTC (rev 21287)
@@ -3,21 +3,14 @@
 - AdvertisedPlatform allows for a custom uname
   ioerror/AdvertisedPlatform
 
-- Remove v0 hidden service statistics
-  karsten/remove-v0hs-stats
-
-o Minor fix to buffer stats
-  karsten/fix-cell-stats
-  [merged 16 Dec 2009 by nickm]
-
 - Fix bridge stats
   karsten/fix-bridge-stats-master
 
 Active branches that want more attention before merging:
 
-- Revised version of Ian and Can's circuit priority code.
-  - Needs testing for switch-on/switch-off logic.
-  nickm/ewma
+- Remove a bunch of old code. I'm pretty sure we don't need it anymore,
+  but needs checking.
+  sebastian/oldstuff
 
 - Make the ?? country explicitly listable in torrc.  Needs review and
   sanity-testing
@@ -52,20 +45,11 @@
 +<nickm> Your backport-control-bw patch tries to printf a uint32_t as a %d
 +<nickm> so does master
 
-o Roger wants to backport the routerparse.c part of proposal 167 so
-  Tors can read params from the consensus and change their
-  behavior. Mostly taken from 381766ce4b1. Should write a patch.
-
-o Move moria1 and Tonga to alternate IP addresses.
-
 Works in progress; keep an eye out on these:
 
 - Nick's bufferevent branch: add support for Libevent's bufferevents.
   nickm/bufferevent
 
-- Nick's microdescriptor code
-  nickm/microdesc
-
 - Updated Linux QoS scripts (still have a couple more changes to go)
   mikeperry/linux-qos