Merge commit 'micah/master'

diff --combined doc/TODO
index 0402b46459a44641249a4e71c05cc89e3e875182,bf51ae0c8cdba2b40f09464e6ea68ce41d6c38f5..c17ef617d77636211ca9b7f69d2ce7d50906629a
--- 1/doc/TODO
--- 2/doc/TODO
+++ b/doc/TODO
@@@ -1,14 -1,23 +1,21 @@@
  Next-Steps Monkeysphere Projects:
  ---------------------------------
  
+ Detail advantages of monkeysphere: detail the race conditions in ssh,
+    and how the monkeysphere can help you reduce these threat vectors:
+    threat model reduction diagrams 
+ 
+ Determine how openssh handles multiple processes writing to
+    known_hosts file (atomic appends?)
+ 
  Handle unknown hosts in such a way that they're not always removed
     from known_hosts file.  Ask user to lsign the host key?
  
 -Handle multiple multiple hostnames (multiple user IDs?) when
 -   generating host keys with gen-key.
 +Handle multiple hostnames (multiple user IDs?) when generating host
 +   keys with gen-key.
  
  Make sure alternate ports are handled for known_hosts.
  
 -Add environment variables sections to man pages.
 -
  Script to import private key into ssh agent.
  
  Provide a friendly interactive UI for marginal or failing client-side
@@@ -47,28 -56,3 +54,28 @@@ Make it easier to do domain-relative ss
     "tsign" in gpg(1).
  
  Fix the order of questions when user does a tsign in gpg or gpg2.
 +
 +File bug against ssh-keygen about how "-R" option removes comments
 +   from known_hosts file.
 +
 +File bug against ssh-keygen to see if we can get it to write to hash a
 +   known_hosts file to/from stdout/stdin.
 +
 +Note all threat model reductions (with diagrams).
 +
 +Add environment variables sections to man pages.
 +
 +Environment variable scoping.
 +
 +Move environment variable precedence before conf file.
 +
 +Handle lockfiles when modifying known_hosts or authorized_keys.
 +
 +When using ssh-proxycommand, if only host keys found are expired or
 +   revoked, then output loud warning with prompt, or fail hard.
 +
 +Update monkeysphere-ssh-proxycommand man page with new keyserver
 +   checking policy info.
 +
 +Update monkeysphere-ssh-proxycommand man page with info about
 +   no-connect option.