Move some todo items to done

todo/done.txt

@@ -1,5 +1,15 @@
 DONE:
 
+o [Zenmap] Combine parallel timed-out hops into one node in the
+  topology view. http://seclists.org/nmap-dev/2012/q1/82 has a patch,
+  however it doesn't handle the case of two or more consecutive
+  timeouts.
+
+o If Nmap uses a "tcpwrapped" port to do fingerprinting on, OS detection
+  might give false matches/results. Since it doesn't really matter which
+  open port gets chosen, we should move onto another open port if we 
+  notice "tcpwrapped".
+
 o Implement an --exclude-ports option. See
   http://seclists.org/nmap-dev/2012/q1/275
 

todo/nmap.txt

@@ -58,14 +58,6 @@ o GSOC 2014 student Jay will be looking at these items:
   o Consider using a binary decision diagram for --exclude list to make
     it more efficient for large exclude lists.  See
     http://seclists.org/nmap-dev/2012/q4/420.
-  o [Zenmap] Combine parallel timed-out hops into one node in the
-    topology view. http://seclists.org/nmap-dev/2012/q1/82 has a patch,
-    however it doesn't handle the case of two or more consecutive
-    timeouts.
-  o If Nmap uses a "tcpwrapped" port to do fingerprinting on, OS detection
-    might give false matches/results. Since it doesn't really matter which
-    open port gets chosen, we should move onto another open port if we 
-    notice "tcpwrapped".
 
 o Adopt an issue tracking system for Nmap and related tools.  We
   should probably look at our needs and options and then decide on and