3 new commits pushed to

<https://github.com/jmpsec/osctrl/tree/main|main>

by javuto

<https://github.com/jmpsec/osctrl/commit/ed8eadd3d6e62d3656f69faf91fd6207dc7e8f45|ed8eadd3>

- Update osctrl.conf

<https://github.com/jmpsec/osctrl/commit/34a171cc3674a2a8827bb67ead128eb21b4db5f5|34a171cc>

- Merge branch 'main' of github.com:jmpsec/osctrl into update_osctrl_conf

<https://github.com/jmpsec/osctrl/commit/b3b134d1553d0680c96782420d0fdae1228bd45c|b3b134d1>

- Merge pull request #458 from peterbogdan/update_osctrl_conf jmpsec/osctrl