Merge upstream changes (which remove already obsolete options).
Merge commits/commented out options from upstream.
Merge comments and commented-out options from upstream. New options now enabled by default: privilege separation for handling incoming network connections and automatic import of locale variables from the client.
Merge upstream config changes (this tightens the security).
Merge changes from upstream Gentoo.
Merge changes from upstream.
Update syslog-ng submodule to v2.3.0
Add new repository configuration (since we want to sync from our frozen git mirror).