snippets r23, 2 items changed

Offer to correct incorrectly set SSH_ASKPASS and DISPLAY environment variables; automatically pick up on and use SSH_AUTH_SOCK if it is set