# Merge branch 'testAddresses' of https://github.com/marler8997/zig into std.net · gitcafe/zig

[View on GitCafe](https://git.cafe/gitcafe/zig/commit/f5ff36271bce54eaec6f20cdff4fa4efb833c0d4)

Repository: [gitcafe/zig](https://git.cafe/gitcafe/zig)

Visibility: public

Requested revision: f5ff36271bce54eaec6f20cdff4fa4efb833c0d4

Requested commit: f5ff36271bce54eaec6f20cdff4fa4efb833c0d4

Commit: f5ff36271bce54eaec6f20cdff4fa4efb833c0d4

Tree: 8773174d52c67f23b723a1f59a437fc6c6d52b58

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge branch 'testAddresses' of https://github.com/marler8997/zig into std.net

```

## Parents

- [0fb1388031ec98af77fe5e0ae8459c983010d1a8](https://git.cafe/gitcafe/zig/commit/0fb1388031ec98af77fe5e0ae8459c983010d1a8?format=markdown)

- [4e0c2ed443a0c13030decf8a9d53aff28f415005](https://git.cafe/gitcafe/zig/commit/4e0c2ed443a0c13030decf8a9d53aff28f415005?format=markdown)

[Source at this commit](https://git.cafe/gitcafe/zig/tree/f5ff36271bce54eaec6f20cdff4fa4efb833c0d4?format=markdown)