[or-cvs] r20856: {projects} two patches that got merged weeks ago. and one i just merged (projects/todo)

[arma@xxxxxxxx]

Author: arma
Date: 2009-10-26 00:10:04 -0400 (Mon, 26 Oct 2009)
New Revision: 20856

Modified:
   projects/todo/git-branches
Log:
two patches that got merged weeks ago. and one i just merged now.


Modified: projects/todo/git-branches
===================================================================
--- projects/todo/git-branches	2009-10-26 01:54:25 UTC (rev 20855)
+++ projects/todo/git-branches	2009-10-26 04:10:04 UTC (rev 20856)
@@ -1,8 +1,8 @@
 Active branches that the author thinks are ready for merge:
 
-- merge http://asteria.noreply.org/~weasel/0001-Ship-test.h-in-release.patch
+o 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.
+o 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
@@ -53,12 +53,14 @@
   in its world map. Does that make it worth backporting? Hm.
   arma/backport-control-bw
   [Optional]
++<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.
 
-- Move moria1 and Tonga to alternate IP addresses.
+o Move moria1 and Tonga to alternate IP addresses.
 
 Works in progress; keep an eye out on these: