From 4e042294e47319b00a1333beee671a36095aa0bb Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 20 Aug 2015 22:59:52 +0200
Subject: IPR, feedback & acknowledgements

---
 docs/olm.rst | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'docs')

diff --git a/docs/olm.rst b/docs/olm.rst
index 7933d36..b175355 100644
--- a/docs/olm.rst
+++ b/docs/olm.rst
@@ -260,6 +260,23 @@ MAC is appended to the message.
         &= HKDF\left(M_{i,j},\,\text{"OLM\_KEYS"}\right) \\
     \end{align}
 
+IPR
+---
+
+The Olm specification (this document) is hereby placed in the public domain.
+
+Feedback
+--------
+
+Can be sent to mark at matrix.org.
+
+Acknowledgements
+----------------
+
+The ratchet that Olm implements was designed by Trevor Perrin and Moxie
+Marlinspike - details at https://github.com/trevp/axolotl/wiki.  Olm is an
+entirely a new implementation written by the Matrix.org team.
+
 .. _`Curve25519`: http://cr.yp.to/ecdh.html
 .. _`Triple Diffie-Hellman`: https://whispersystems.org/blog/simplifying-otr-deniability/
 .. _`HKDF-SHA-256`: https://tools.ietf.org/html/rfc5869
-- 
cgit v1.2.3