Merge upstream-master into master

Commit ecb2c02d994b3e21994f31a70ff911667c262f1f upstream

This nearly (but not quite) corresponds to V_8_3_P1; subsequent
cherry-picks will correct this.

Bug: 162492243
Change-Id: I3c079d86435b7c25aefff4538dc89a3002b1e25b
diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..eef037a
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,17 @@
+name: "openssh"
+description:
+    "Secure Shell (SSH) protocol client, server and utilities"
+
+third_party {
+  url {
+    type: HOMEPAGE
+    value: "https://www.openssh.com/"
+  }
+  url {
+    type: GIT
+    value: "https://github.com/openssh/openssh-portable"
+  }
+  version: "8.3p1"
+  last_upgrade_date { year: 2020 month: 8 day: 20 }
+  license_type: NOTICE
+}