Merge branch 'master' of github.com:urbit/urbit

base/arvo/clay.hoon

@@ -1699,8 +1699,6 @@
             %that
           ?:  =(r.ali.dat r.bob.dat)
             (done:he ~)
-          ?:  (~(has in (reachable-takos r.bob.dat)) r.ali.dat)
-            (done:he ~)
           =.  new.dat  (make-yaki [r.ali.dat r.bob.dat ~] q.ali.dat now)
           =.  hut.ran  (~(put by hut.ran) r.new.dat new.dat)
           =.  erg.dat

base/arvo/eyre.hoon

@@ -504,6 +504,9 @@
         %hat  (foreign-hat:(ses-ya p.u.mez) q.p.kyz q.u.mez)
         %get  (pass-note ay/(dray p/uv/~ q.p.kyz p.u.mez) [%e %this q.u.mez])
         %got
+          ?.  (~(has by pox) p.u.mez)
+            ~&  lost-gram-thou/p.u.mez
+            +>.$
           =:  hen  (~(got by pox) p.u.mez)
               pox  (~(del by pox) p.u.mez)
             ==