commit d9da10d147d633fdb6ec65e17ff4b8447419d83e
author Alistair Delva <adelva@google.com> Thu Aug 20 16:14:23 2020 -0700
committer Alistair Delva <adelva@google.com> Thu Aug 20 16:53:18 2020 -0700
tree 8f93e8fdc2907f141e0924910bfec26669819f0b
parent 22246b08952d746a7cc5a292570636cf4277598f
parent ecb2c02d994b3e21994f31a70ff911667c262f1f

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

README.version

diff --git a/README.version b/README.version
index 3888416..030d77d 100644
--- a/README.version
+++ b/README.version
@@ -1,4 +1,4 @@
-URL: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-6.8p1.tar.gz
-Version: 6.8p1
+URL: https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-8.3p1.tar.gz
+Version: 8.3p1
 BugComponent: 180238
 Owners: adelva, cloud-android-devs