[or-cvs] r20594: {projects} merged a bunch of commits (projects/todo)

[arma at seul.org]

Author: arma
Date: 2009-09-16 21:30:14 -0400 (Wed, 16 Sep 2009)
New Revision: 20594

Modified:
   projects/todo/git-branches
Log:
merged a bunch of commits


Modified: projects/todo/git-branches
===================================================================
--- projects/todo/git-branches	2009-09-17 00:25:21 UTC (rev 20593)
+++ projects/todo/git-branches	2009-09-17 01:30:14 UTC (rev 20594)
@@ -1,19 +1,21 @@
 Active branches that the author thinks are ready for merge:
 
-- update manpage. it isn't cached-routers anymore
+o update manpage. it isn't cached-routers anymore
   sebastian/manpage
 
-- fix a spec conformance issue (exactly one signature per vote)
+o fix a spec conformance issue (exactly one signature per vote)
   sebastian/specconformance
 
-- make sure we're not choosing a relay as an exit that we have excluded
+o make sure we're not choosing a relay as an exit that we have excluded
   sebastian/bug1090
 
-- Dump unparseable descriptors to disk; helps diagnosing 1051
+o Dump unparseable descriptors to disk; helps diagnosing 1051
   karsten/fix-1051-file2-maint-0.2.1
+  [Merged into master in late August, and not into 0.2.1 I think -RD]
 
-- Don't call time(NULL) more often than needed.
+o Don't call time(NULL) more often than needed.
   karsten/no-time-maint-0.2.1
+  [Merged only to master, since I don't think it hurts 0.2.1 to leave it -RD]
 
 Active branches that want more attention before merging:
 
@@ -56,6 +58,10 @@
   in its world map. Does that make it worth backporting? Hm.
   arma/backport-control-bw
 
+- 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.
+
 Works in progress; keep an eye out on these:
 
 - Nick's bufferevent branch: add support for Libevent's bufferevents.