Merge tag 'v2.9.5' into maint-2.10

Git 2.9.5

diff --cc cache.h
Simple merge

diff --cc connect.c
index 722dc3f,c75bf52..048fa04
--- 1/connect.c
--- 2/connect.c
+++ b/connect.c
@@@ -771,7 -766,10 +779,10 @@@ struct child_process *git_connect(int f
                                return NULL;
                        }
  
 -                      ssh = getenv("GIT_SSH_COMMAND");
+                       if (looks_like_command_line_option(ssh_host))
+                               die("strange hostname '%s' blocked", ssh_host);
+ 
 +                      ssh = get_ssh_command();
                        if (!ssh) {
                                const char *base;
                                char *ssh_dup;

diff --cc path.c
Simple merge