Merge branch 'master' of git://git.qubes-os.org/joanna/core
on (#635)

Parse config and setup socket before fork.