diff --git a/doc/TODO.020 b/doc/TODO.020
index d5bc514cc..5454ab349 100644
--- a/doc/TODO.020
+++ b/doc/TODO.020
@@ -18,3 +18,10 @@ Backport for 0.2.0 once better tested:
   - r16558: Avoid mis-routing CREATED cells.
   - r16621: Make some DNS code more robust (partial; see also libevent
             approach). (Also maybe r16674)
+  - r16915,r16916: Don't fail hidden service request if the descriptor
+            fetch fails for one descriptor version, when the other might
+            still succeed. (Will be more problematic if not backported
+            as soon as services stop publishing version 0 descriptors.)
+  - r16808,r16810,r16817,r16818,r16939: Don't send tunneled hidden service
+            directory requests to routers for which we don't have a
+            router descriptor. (Will significantly improve reliability.)