After some investigations by myself and a constructive discussion with Anthony Goubard
(maintainer of the official XINS project) we have decided to backport features from my XINS 3-fork upstream instead of the other way around. Features will be discussed and ported one by one. This is the safest approach, leaving the baseline stable and only introducing changes gradually.
Expect some changes to go into the upcoming XINS 2.3 release, while most will come into the picture only after that.
Stay tuned for updates.