Merge branch 'master' into 'feature/machine-raw-data'

# Conflicts:
#   api.capnp

connection.capnp

@@ -41,38 +41,3 @@ interface Bootstrap {
     # Diflouroborane stores machine¹ information in an opaque internal database. This interface is
     # the only stable process of modifying that information
 }
-
-struct Greeting {
-    # Be nice and say hello to each other first
-    # A client sends this message to a server first thing, a server then replies
-    # similarly
-
-    # Hello, I'm …
-    host @0 :Text; # non-qualified Hostname of the client/server, as applicable
-
-    # using the program …
-    program @1 :Text; # SHOULD be of the form `programname-version`
-
-    # and speak the API version …
-    major @2 :UInt32; # The major part of the API version
-    minor @3 :UInt32; # The minor part of the API version
-}
-
-struct Leave {
-    # Be nice and tell the other side before aborting a connection
-    enum Reason {
-        other @0;
-        # None of the more specific reasons.  An implementation SHOULD provide
-        # more (human-readable) information in the `message` field.
-
-        incompatible @1;
-        # The API versions are in some way incompatible.  Doesn't need much of
-        # an explanation so an implementation MAY leave the message field
-        # empty.
-    }
-
-    reason @0 :Reason;
-    message @1 :Text;   
-    # An implementation SHOULD send a human-readable message along, with the
-    # exception of reasons that are self-explanatory (e.g. incompatible versions)
-}