| commit | ed358b3546c776c1c677fd88eb8f716cf6187510 | [log] [tgz] |
|---|---|---|
| author | Alistair Delva <adelva@google.com> | Fri Aug 21 00:00:13 2020 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Aug 21 00:00:13 2020 +0000 |
| tree | 3c6134bcb2cda4b9dccc57b4a8b997a945aab62d | |
| parent | 22246b08952d746a7cc5a292570636cf4277598f [diff] | |
| parent | 44a1065de8a58c51a021243a28bfa01e87822e4f [diff] |
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