summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Stock <stuart@int08h.com>2019-02-09 08:12:57 -0600
committerStuart Stock <stuart@int08h.com>2019-02-09 08:12:57 -0600
commit3e2ebd590839ddf173f7b307582602abc22b7db7 (patch)
treef18ee92333b9ed9bf7a80a2e66f4d0665eba086d
parenta5fc96c00d6edc23811933e73b0175e8bab1ccb1 (diff)
parent911daced8e29aa648f48230efbdf077ad0f3dbbd (diff)
downloadroughenough-3e2ebd590839ddf173f7b307582602abc22b7db7.zip
Merge branch 'master' into 1.1.4
-rw-r--r--README.md3
1 files changed, 2 insertions, 1 deletions
diff --git a/README.md b/README.md
index aec2853..70bf5b7 100644
--- a/README.md
+++ b/README.md
@@ -170,7 +170,7 @@ how to enable and use.
Roughtime features not implemented by the server:
* On-line (while server is running) key rotation. The server must be restarted to generate a new delegated key.
-* The Rougheough server depends on the host's time source to comply with the smeared leap-second
+* The Roughenough server depends on the host's time source to comply with the smeared leap-second
requirement of the Roughtime protocol. A Roughenough server sourcing time from
[Google's public NTP servers](https://developers.google.com/time/) would produce compliant
smeared leap-seconds but time sourced from members of `pool.ntp.org` likely will not.
@@ -186,6 +186,7 @@ created by Adam Langley and Robert Obryk.
* Stuart Stock (stuart {at} int08h.com)
* Aaron Hill (aa1ronham {at} gmail.com)
* Peter Todd (pete {at} petertodd.org)
+* Muncan90 (github.com/Muncan90)
## Copyright and License
Roughenough is copyright (c) 2017-2019 int08h LLC. All rights reserved.