**Shawn Webb** @lattera@bsd.network · Sep 14, 2019, 19:43

**Shawn Webb** @lattera@bsd.network · Sep 14, 2019, 19:43

Current status: while new windows are installed at home, I'm working on resolving the #HardenedBSD 12-STABLE merge conflict.

I'm taking my time with this one as I will be merging in the #FreeBSD ASR work as detailed over a month ago.

I want to make sure this is done right.

**David Cross** @david@mastodon.crossfamilyweb.com · 2019-09-15T02:09:12Z

David Cross @david@mastodon.crossfamilyweb.com

@lattera merging in? Are you keeping your implementation, just resyncing everything around it?

**Shawn Webb** @lattera@bsd.network · Sep 15, 2019, 10:22

**Shawn Webb** @lattera@bsd.network · Sep 15, 2019, 10:22

Shawn Webb @lattera@bsd.network

@david We're keeping our PaX ASLR implementation. HardenedBSD users will be able to choose between FreeBSD ASR and HardenedBSD ASLR at runtime.

**David Cross** @david@mastodon.crossfamilyweb.com · Sep 15, 2019, 23:35

**David Cross** @david@mastodon.crossfamilyweb.com · Sep 15, 2019, 23:35

David Cross @david@mastodon.crossfamilyweb.com

@lattera wow. That is super awesome