[or-cvs] r20775: {projects} Please merge debian-tor-0.2.2.4-alpha-1 and Ship-test.h-in-r (projects/todo)

[weasel@xxxxxxxx]

Author: weasel
Date: 2009-10-11 05:09:05 -0400 (Sun, 11 Oct 2009)
New Revision: 20775

Modified:
   projects/todo/git-branches
Log:
Please merge debian-tor-0.2.2.4-alpha-1 and Ship-test.h-in-release.patch into master.

Modified: projects/todo/git-branches
===================================================================
--- projects/todo/git-branches	2009-10-10 23:28:55 UTC (rev 20774)
+++ projects/todo/git-branches	2009-10-11 09:09:05 UTC (rev 20775)
@@ -1,6 +1,8 @@
 Active branches that the author thinks are ready for merge:
 
-o merge weasel's debian branch at tag debian-tor-0.2.2.3-alpha-1 into master.
+- merge http://asteria.noreply.org/~weasel/0001-Ship-test.h-in-release.patch
+
+- 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