diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-08-18 14:54:31 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-18 14:54:31 +0000 |
commit | 7207004e108ffbf52e64ed73fe7b43a28b4d5eab (patch) | |
tree | facce78d1027fd414513b085283e878d65d8722e /src/sys | |
parent | 05657e21a71f2bc3b2eb94267694524165896e89 (diff) | |
parent | d133d3db7699bdf61441764d4278533539208ee1 (diff) | |
parent | e6f972cde19ce41b647e778f6fbae7a001c56606 (diff) | |
parent | c6ce95537c3e479b06c824accc5997deebf430dc (diff) | |
download | nix-7207004e108ffbf52e64ed73fe7b43a28b4d5eab.zip |
Merge #1486 #1490 #1493
1486: Relax assertions in sockaddr_storage_to_addr to match the documentation. r=asomers a=khuey
Fixes #1479
1490: add libc::IP6T_SO_ORIGINAL_DST to socket opt r=asomers a=bearice
the original PR #1410 was stalled for a while
let's make it happen.
this should closes #1410 and #938
1493: Fix crates.io badge r=asomers a=atouchet
Co-authored-by: Kyle Huey <khuey@kylehuey.com>
Co-authored-by: Icemic <bingfeng.web@gmail.com>
Co-authored-by: Bearice Ren <bearice@icybear.net>
Co-authored-by: Alex Touchet <alextouchet@outlook.com>