Merge pull request #6460 from annando/relaying
authorHypolite Petovan <hypolite@mrpetovan.com>
Fri, 18 Jan 2019 00:09:33 +0000 (19:09 -0500)
committerGitHub <noreply@github.com>
Fri, 18 Jan 2019 00:09:33 +0000 (19:09 -0500)
Simplyfies AP relaying, fixes relaying of public contacts


Trivial merge