From: Mark Wooding <mdw@distorted.org.uk>
Date: Wed, 11 Oct 2017 01:02:39 +0000 (+0100)
Subject: server/: Post-merge fixup.
X-Git-Tag: 1.5.0~40
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/commitdiff_plain/56c76774f4077c83e975d51c3488f43e54390b5c?hp=56c76774f4077c83e975d51c3488f43e54390b5c

server/: Post-merge fixup.

There's a slightly nasty semantic conflict between the two branches:
mdw/knock introduces a new function which sends a packet to an address
which might not belong to a registered peer, and mdw/ipv6 means that
this now has to cope with multiple address families.  The mess is
surprisingly limited, all things considered.
---