Merge branch 'nostr-protocol:master' into nip15_shipping_cost_per_pro… #nips_changes

https://github.com/nostr-protocol/nips/commit/d3a9962d66ba02de80347e543f29141d19714890