upstream #332

Manually merged
jwinterm merged 3 commits from :upstream into master 4 years ago

3 Commits (master)

Author SHA1 Message Date
moneromooo-monero 10c30ea5aa
link libzmq against libgssapi_krb5 if found
continuous-integration/drone/pr Build is passing Details
4 years ago
moneromooo-monero 83fe535888
fix a couple bugs found by OSS-fuzz
4 years ago
xiphon e52e01a445
daemon: Windows - fix FAT32 warning, trailing backslash is required
4 years ago