[or-cvs] r22503: {projects} remove some merged branches from git-branches (projects/todo)

[Nick Mathewson]

Author: nickm
Date: 2010-06-11 17:24:05 +0000 (Fri, 11 Jun 2010)
New Revision: 22503

Modified:
   projects/todo/git-branches
Log:
remove some merged branches from git-branches

Modified: projects/todo/git-branches
===================================================================
--- projects/todo/git-branches	2010-06-11 10:45:43 UTC (rev 22502)
+++ projects/todo/git-branches	2010-06-11 17:24:05 UTC (rev 22503)
@@ -1,24 +1,11 @@
 Active branches that the author thinks are ready for merge:
 
-- Add maatuska as eighth v3 directory authority
-  karsten/maatuska-new-v3auth
-
-- Add an option to disable warnings when Tor gets only an IP address
-  sebastian/hostnamewarn
-
-- Fix bug 1522 (don't die on unset $HOME)
-  sebastian/bug1522
-
 - Add new balanced node weights to consensus.
   mikeperry/consensus-bw-weights3
 
-- Add idea for integrating Tor with SPDY (currently in hibernation
-  until SPDY code matures or someone keen starts on it)
-  sjm217/xxx-using-spdy
-
 - Nick's bufferevent branch: add support for Libevent's bufferevents.
   Requires latest Libevent from git (as of 24 Mar 2009) if you want to
-  turn on the bufferevent support. 
+  turn on the bufferevent support.
   nickm/bufferevent3
 
 - Make dir-spec more strict about what exactly is conforming