Merge remote-tracking branch 'origin/master' into thread-next

diff --cc distro/pkg/deb/control
index 5e8378834c01dacd1eea9a666e0b254059c30bff,ff62248b9a9330efd274b4353a0fff5feb071ec6..6b08813b43747b04fc04f783aa2245d61b3c6057
--- 1/distro/pkg/deb/control
--- 2/distro/pkg/deb/control
+++ b/distro/pkg/deb/control
@@@ -18,15 -18,18 +18,15 @@@ Build-Depends-Indep
   opensp,
   texlive-latex-extra,
  Maintainer: Jakub Ružička <jakub.ruzicka@nic.cz>
 -Uploaders:
 - Ondřej Surý <ondrej@debian.org>,
  Standards-Version: 4.7.0
 -Vcs-Browser: https://salsa.debian.org/debian/bird2
 -Vcs-Git: https://salsa.debian.org/debian/bird2.git
 +Vcs-Browser: https://salsa.debian.org/debian/bird3
 +Vcs-Git: https://salsa.debian.org/debian/bird3.git
- Homepage: https://bird.network.cz/
+ Homepage: https://bird.nic.cz/
  Rules-Requires-Root: no
  
 -Package: bird2
 -Architecture: kfreebsd-any linux-any
 +Package: bird3
 +Architecture: linux-any kfreebsd-any
  Pre-Depends:
 - init-system-helpers,
   ${misc:Pre-Depends},
  Depends:
   adduser,

diff --cc doc/bird.sgml
Simple merge

diff --cc misc/bird.spec
Simple merge