[or-cvs] r20178: {projects} take care of the easy pending git branches (projects/todo)

[arma@xxxxxxxx]

Author: arma
Date: 2009-07-28 00:11:23 -0400 (Tue, 28 Jul 2009)
New Revision: 20178

Modified:
   projects/todo/git-branches
Log:
take care of the easy pending git branches


Modified: projects/todo/git-branches
===================================================================
--- projects/todo/git-branches	2009-07-28 01:31:23 UTC (rev 20177)
+++ projects/todo/git-branches	2009-07-28 04:11:23 UTC (rev 20178)
@@ -4,8 +4,9 @@
   mikeperry/rs-format-fix7
   [except Sebastian is going to clean it up first]
 
-- fix for bug 1026:
+o fix for bug 1026:
   sebastian/bug1026
+  [Merged to maint-0.2.1 -RD]
 
 o Add a new config option to make bulkexitlist work better:
   ioerror/DirFetchInfoExtraEarly
@@ -21,34 +22,7 @@
   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
-@@ -444,8 +444,10 @@ assign_onionskin_to_cpuworker(connection_t *cpuworker,
-   if (1) {
-     if (num_cpuworkers_busy == num_cpuworkers) {
-       log_debug(LD_OR,"No idle cpuworkers. Queuing.");
--      if (onion_pending_add(circ, onionskin) < 0)
-+      if (onion_pending_add(circ, onionskin) < 0) {
-+        tor_free(onionskin);
-         return -1;
-+      }
-       return 0;
-     }
+o Fix dirreq and cell stats on 32-bit architectures; apply to master only.
+  karsten/fix-dirreq-warning-master
+  [Merged to master -RD]
 
-fix to remove spaces from the fingerprint file that we write out:
---- a/src/or/router.c
-+++ b/src/or/router.c
-@@ -570,7 +570,7 @@ init_keys(void)
-   /* 5. Dump fingerprint to 'fingerprint' */
-   keydir = get_datadir_fname("fingerprint");
-   log_info(LD_GENERAL,"Dumping fingerprint to \"%s\"...",keydir);
--  if (crypto_pk_get_fingerprint(get_identity_key(), fingerprint, 1)<0) {
-+  if (crypto_pk_get_fingerprint(get_identity_key(), fingerprint, 0)<0) {
-     log_err(LD_GENERAL,"Error computing fingerprint");
-     tor_free(keydir);
-     return -1;
-
- - Fix dirreq and cell stats on 32-bit architectures; apply to master only.
-   karsten/fix-dirreq-warning-master
-