One conflict, CHANGELOG.md. Cargo.toml and Cargo.lock auto-merged to 0.6.0-dev, so next's version needed no resolution and none was made: the move to 1.0.0-dev belongs to the v0.5.0 rollover, not here. next carried its own [0.4.2] - unreleased section, which the plan does not anticipate. It was not merely reorganized relative to the released text, as master's was: it had been adapted to describe next's code, reading "Six sites" and "five failure paths" where the release says five and four. That adaptation is real rather than a mistake, since next's session.rs has seven discard sites against maint's six. Resolved toward the released text. A [0.4.2] heading is the historical record of what shipped and must read identically on every branch; next's seventh site is next's own change and belongs under its [Unreleased] or [0.5.0], not inside a released version's entry. next's [0.4.2] is now byte-identical to the tag's. next's own sections are untouched, at their exact pre-merge bullet counts: Breaking 23, [Unreleased] 10, [0.5.0] 39. The Breaking block still targets v0.6.0; retargeting it is part of the rollover, which D13 settled but which executes at v0.5.0. CHANGELOG.md was rebuilt from parts with every boundary asserted against its heading text first. The guard caught an off-by-one in its own index check and stopped before writing, which is the reason to write the assertions.
FIPS Documentation
FIPS (Free Internetworking Peering System) is a self-organizing encrypted mesh network built on Nostr identities, capable of operating over arbitrary transports — local networks, the public internet, Tor, Bluetooth, or point-to-point links — without central infrastructure.
With FIPS, your machine becomes a node in the mesh with a self-generated cryptographic identity. There are two ways to deploy it.
As an overlay on top of existing IP networks, FIPS lets your node reach any other FIPS node wherever it sits — behind a NAT, on a different ISP, on a phone over cellular, on a laptop with only Bluetooth in range, or behind a Tor onion. The mesh forwards IPv6 traffic transparently and end-to-end encrypted, with no central VPN concentrator or coordinating server.
From the ground up over raw Ethernet, WiFi, or Bluetooth, FIPS provides a complete permissionless network without any pre-existing IP infrastructure, ISP, or DNS. Any node that joins the link gets routable IPv6 addresses, peer discovery, and a path to every other node automatically.
Either way, existing networking software runs over it unchanged: SSH, HTTP servers, file transfer, anything IPv6-native works the same way it would on a local network.
New to FIPS? Start with the Getting Started guide.
Documentation Sections
Tutorials
If you are starting from scratch and want a guided path to a working mesh, go here.
How-To Guides
If you have a specific task in mind — enabling a feature, deploying a component, diagnosing a problem — go here.
Reference
If you need to look up wire formats, configuration keys, command flags, or counter inventories, go here.
Design
If you want to understand how the mesh self-organizes, why FIPS makes the choices it does, or how the pieces fit together, go here.