Merge pull request #251 from autocrypt/gossip-simplify

never prefer a gossip key over a directly received one. Fixes #248.
autocrypt · Nov 15, 2017 · 01755f3 · 01755f3
2 parents 3f4fe07 + f2aa973
commit 01755f3
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/doc/level1.rst b/doc/level1.rst
@@ -525,8 +525,7 @@ The first phase computes the ``preliminary-recommendation``.
 Preliminary Recommendation
 __________________________
 
-If either ``public_key`` is ``null``, or ``autocrypt_timestamp`` is
-more than 35 days older than ``gossip_timestamp``, set
+If ``public_key`` is ``null``, then set
 ``target-keys[to-addr]`` to ``gossip_key`` and set
 ``preliminary-recommendation`` to ``discourage`` and skip to the
 :ref:`final-recommendation-phase`.