[or-cvs] r20142: {projects} Mention some of my branches; change the format; stop implyin (projects/todo)

[nickm at seul.org]

Author: nickm
Date: 2009-07-25 01:04:29 -0400 (Sat, 25 Jul 2009)
New Revision: 20142

Modified:
   projects/todo/git-branches
Log:
Mention some of my branches; change the format; stop implying that this is all for 0.2.2.1-alpha

Modified: projects/todo/git-branches
===================================================================
--- projects/todo/git-branches	2009-07-25 04:50:05 UTC (rev 20141)
+++ projects/todo/git-branches	2009-07-25 05:04:29 UTC (rev 20142)
@@ -1,16 +1,26 @@
+Active branches to merge or improve:
 
-To go into 0.2.2.1-alpha:
+- Mikeperry's bw voting stuff:
+  mikeperry/rs-format-fix7
+  [except Sebastian is going to clean it up first]
 
-Mikeperry's bw voting stuff:
-mikeperry/rs-format-fix7
-except Sebastian is going to clean it up first
+- fix for bug 1026:
+  sebastian/bug1026
 
-fix for bug 1026:
-sebastian/bug1026
+o Add a new config option to make bulkexitlist work better:
+  ioerror/DirFetchInfoExtraEarly
+  [Merged to master]
 
-Add a new config option to make bulkexitlist work better:
-ioerror/DirFetchInfoExtraEarly
+- Include the git version where the svn revision used to be
+  nickm/gitversion
 
+- Merge Christopher Davis's outgoing SOCKS code.
+  nickm/socks-client
+
+- Wyllys Ingersoll's support for AES on some Solaris versions
+  nickm/solaris-aes
+  Needs work; see nickm's mail to tor-volunteer of 11 June 2009
+
 fix for bug 1034:
 --- a/src/or/cpuworker.c
 +++ b/src/or/cpuworker.c