From 396ebc075abdce23bdb8a6af59a50bdc9666bc2c Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 21 Sep 2007 20:02:50 +0000
Subject: [PATCH]  r15261@catbus:  nickm | 2007-09-21 15:58:27 -0400  Make a
 couple more backportable patches.

svn:r11562
---
 doc/TODO.012 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/TODO.012 b/doc/TODO.012
index f014820d86..d889f0a8cd 100644
--- a/doc/TODO.012
+++ b/doc/TODO.012
@@ -23,4 +23,5 @@ Backport for 0.1.2.x once better tested:
   - r11287: Reject address mappings to internal addresses. (??)
   - r11499, r11500, r11501: hidserv hexdigests rather than nicknames
   - r11548, the osx /tmp fix
-
+  - r11293: Bulletproof code to generate extend info.
+  - r11332: Fix user-triggerable segfault in expand_filename("~")
\ No newline at end of file