tree 3c6134bcb2cda4b9dccc57b4a8b997a945aab62d
parent 22246b08952d746a7cc5a292570636cf4277598f
parent 44a1065de8a58c51a021243a28bfa01e87822e4f
author Alistair Delva <adelva@google.com> 1597968013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1597968013 +0000

Merge changes I934c73d4,I28cdc9a0,I9e734da9,I3c079d86

* changes:
  UPSTREAM: depend
  UPSTREAM: upstream: avoid possible NULL deref; from Pedro Martelletto
  Revert "upstream: fix compilation with DEBUG_KEXDH; bz#3160 ok dtucker@"
  Merge upstream-master into master