[or-cvs] r22787: {projects} unlist some git-branches, merge others, move some to trac, a (projects/todo)

[Nick Mathewson]

Author: nickm
Date: 2010-08-03 15:07:35 +0000 (Tue, 03 Aug 2010)
New Revision: 22787

Modified:
   projects/todo/git-branches
Log:
unlist some git-branches, merge others, move some to trac, and deprecate the git-branches file.

Modified: projects/todo/git-branches
===================================================================
--- projects/todo/git-branches	2010-08-03 13:51:08 UTC (rev 22786)
+++ projects/todo/git-branches	2010-08-03 15:07:35 UTC (rev 22787)
@@ -1,21 +1,12 @@
-Active branches that the author thinks are ready for merge:
+[
 
-- Add new balanced node weights to consensus.
-  mikeperry/consensus-bw-weights3
 
-- 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.
-  nickm/bufferevent3
+    PLEASE DO NOT ADD MORE STUFF TO git-branches; PLEASE USE TRAC
+    INSTEAD.
 
-- Make dir-spec more strict about what exactly is conforming
-  nickm/dir-spec
 
-- Refactor the heck out of get_next_token to make it stricter and easier to
-  verify as correct
-  nickm/get_next_token
+]
 
-
 Active branches that want more attention before merging:
 
 - Backport the "always weight routers by bandwidth" fix? (No, according to arma
@@ -23,39 +14,10 @@
   more.)
   245be159afa206676b05b9b5d5a11aa1f6b25bd7
 
-- Update the rpm spec file
-  erinn/rpm-devel
-
 - AdvertisedPlatform allows for a custom uname, problematic for metrics stuff
   according to karsten.
   ioerror/AdvertisedPlatform
 
-- Make the ?? country explicitly listable in torrc.  Needs review and
-  sanity-testing
-  nickm/bug1094
-
-- Include the git version where the svn revision used to be
-  nickm/gitversion
-  [Merged to master; candidate for maint-0.2.1]
-
-- 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
-
-- Some refactorings for the mlockall feature.
-  sebastian/mlockall
-
-. Remove .noconnect support
-  ioerror/LetsKillNoConnect
-  [Merged to master.  Perhaps merge to maint-0.2.1. -NM]
-
-. Remove .exit support by default
-  arma/dotexit
-  [Merged to master.  Still needs merge to maint-0.2.1 -NM]
-
-  - Better removed .exit support
-    nickm/more.exit
-
 Things to backport/merge to 0.2.1.x for 0.2.1.20 release:
 
 - Let 0.2.1.x controllers hear bandwidth numbers from the consensus.