# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1661172815 -3600
# Node ID 72f431b4dc2c24c68f76f29809bbe7d502365188
# Parent  6d9ee0a3eb4b8b9ace0628c16538ffe28cef984c# Parent  2d330edf8bf2a7fd37fcde81751d9d7fe25936d7
Merge role-auth->trunk

diff -r 2d330edf8bf2 -r 72f431b4dc2c doc/doap.xml
--- a/doc/doap.xml	Mon Aug 22 13:03:10 2022 +0100
+++ b/doc/doap.xml	Mon Aug 22 13:53:35 2022 +0100
@@ -60,6 +60,7 @@
     <implements rdf:resource="https://www.rfc-editor.org/info/rfc7395"/>
     <implements rdf:resource="https://www.rfc-editor.org/info/rfc7590"/>
     <implements rdf:resource="https://www.rfc-editor.org/info/rfc7673"/>
+    <implements rdf:resource="https://www.rfc-editor.org/info/rfc8305"/>
     <implements rdf:resource="https://www.rfc-editor.org/info/rfc9266"/>
     <implements rdf:resource="https://datatracker.ietf.org/doc/draft-cridland-xmpp-session/">
       <!-- since=0.6.0 note=Added in hg:0bbbc9042361 -->
diff -r 2d330edf8bf2 -r 72f431b4dc2c net/connect.lua
--- a/net/connect.lua	Mon Aug 22 13:03:10 2022 +0100
+++ b/net/connect.lua	Mon Aug 22 13:53:35 2022 +0100
@@ -3,7 +3,6 @@
 local new_id = require "util.id".short;
 local timer = require "util.timer";
 
--- TODO #1246 Happy Eyeballs
 -- FIXME RFC 6724
 -- FIXME Error propagation from resolvers doesn't work
 -- FIXME #1428 Reuse DNS resolver object between service and basic resolver