[or-cvs] r11288: Note backportability, and cleanup. (in tor/branches/tor-0_1_2-patches: . doc)

[nickm at seul.org]

Author: nickm
Date: 2007-08-27 11:38:17 -0400 (Mon, 27 Aug 2007)
New Revision: 11288

Modified:
   tor/branches/tor-0_1_2-patches/
   tor/branches/tor-0_1_2-patches/doc/TODO.012
Log:
 r14229 at Kushana:  nickm | 2007-08-27 11:38:01 -0400
 Note backportability, and cleanup.



Property changes on: tor/branches/tor-0_1_2-patches
___________________________________________________________________
 svk:merge ticket from /tor/branches/012 [r14229] on c95137ef-5f19-0410-b913-86e773d04f59

Modified: tor/branches/tor-0_1_2-patches/doc/TODO.012
===================================================================
--- tor/branches/tor-0_1_2-patches/doc/TODO.012	2007-08-27 15:33:58 UTC (rev 11287)
+++ tor/branches/tor-0_1_2-patches/doc/TODO.012	2007-08-27 15:38:17 UTC (rev 11288)
@@ -1,3 +1,6 @@
+(Remember to include both the revision number _AND_ an abbreviated
+description of the patch.)
+
 Backport items for 0.1.2:
   o r10939: Choose with complete fairness when exits are weighted.
   o r10956: fix the math for exit bandwidth weighting
@@ -15,6 +18,6 @@
   - coderman's constrained socket buffers patch (r10843)
   o r10964: control.c grammar conformance. could conceivably break
     old controllers that were relying on non-conformance.
-  - some subset of r11229?
+  - some subset of r11229 (unexpected whitespace in malformed descriptors)?
+  - r11287: Reject address mappings to internal addresses. (??)
 
-